From 82674896fb76d16c146a5a50a2de16bbdd672fbf Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Wed, 1 May 2024 03:09:45 +1200 Subject: [PATCH] A birdshot atmos improvement, and fixes the engineering microwave. (#82924) ## About The Pull Request I have changed the layout of the pumps going into atmos from the tanks to make it easier to use. ![image](https://github.com/tgstation/tgstation/assets/64122807/ec95eab6-b7ac-4927-b3d9-70f7c58e5dc8) ![image](https://github.com/tgstation/tgstation/assets/64122807/571bb2f3-49c8-4b4b-9d9d-405a8d5a06eb) I also fixed the engineering microwave. I also adjusted the name for the pumps and vents in the AI chamber. This is my first PR! ## Why It's Good For The Game This change allow people to easily set up a pump to fill up a can with the gas they want. Before this it was impossible to fill up an n2o can and a plasma can without making a big mess or having them mix together. The microwave in engi being able to work is also a good quality of life change for the poor engineers that want to cook a donk pocket in their department. The change of names for the vents and pumps in the AI chamber is for consistency sake. n2o is not helium! ## Changelog :cl: qol: Made birdshot atmos easier to use. fix: The Birdshot engineering department is no longer using a second hand broken microwave. /:cl: --- _maps/map_files/Birdshot/birdshot.dmm | 350 +++++++++++++------------- 1 file changed, 176 insertions(+), 174 deletions(-) diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 836c5a20a51..acef74e76e7 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -632,8 +632,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "api" = ( @@ -647,17 +647,11 @@ /area/station/science/server) "apj" = ( /obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ dir = 4 }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/space) "apk" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_red{ @@ -1720,6 +1714,7 @@ dir = 4 }, /obj/machinery/light/cold/directional/north, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "aOx" = ( @@ -2566,10 +2561,10 @@ /turf/open/floor/iron/small, /area/station/security/office) "bkI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 5 - }, /obj/machinery/status_display/evac/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "bkO" = ( @@ -2987,13 +2982,7 @@ /area/station/maintenance/starboard/greater) "brC" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{ dir = 4 }, /turf/open/floor/plating, @@ -3514,8 +3503,9 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "bDO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 10 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "N2 to Pure" }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -3733,6 +3723,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/radio/intercom/directional/west, /obj/machinery/status_display/evac/directional/south, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "bJZ" = ( @@ -4846,7 +4837,7 @@ "chb" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 5 + dir = 8 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -7529,12 +7520,12 @@ /turf/open/floor/iron/dark/small, /area/station/security/checkpoint/customs/auxiliary) "dqV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ + dir = 5 }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/turf/open/floor/plating/airless, +/area/space/nearstation) "dqX" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -9088,6 +9079,7 @@ /area/station/medical/medbay/aft) "dYY" = ( /obj/machinery/light/cold/dim/directional/north, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "dZa" = ( @@ -9159,6 +9151,10 @@ /area/station/maintenance/department/medical/central) "dZX" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/binary/pump/off/general/visible{ + dir = 4; + name = "Air to Pure" + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "dZZ" = ( @@ -10263,6 +10259,10 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/clothing/head/cone{ + pixel_x = -7; + pixel_y = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "exE" = ( @@ -13350,8 +13350,9 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/ai_monitored/turret_protected/aisat/teleporter) "fJt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 4 +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ + dir = 8; + initialize_directions = 8 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -15803,7 +15804,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "gCR" = ( @@ -18459,18 +18460,12 @@ /turf/open/floor/plating, /area/station/cargo/miningoffice) "hsL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ dir = 6 }, /turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) +/area/space/nearstation) "hsO" = ( /obj/structure/cable, /obj/effect/spawner/structure/window, @@ -20274,14 +20269,12 @@ /turf/open/floor/iron, /area/station/cargo/miningfoundry) "hZf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{ +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ dir = 4 }, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/turf/open/floor/plating/airless, +/area/space/nearstation) "hZP" = ( /obj/structure/cable, /obj/structure/sign/poster/official/random/directional/north, @@ -20849,8 +20842,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -21660,7 +21653,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /turf/open/floor/iron, @@ -24484,14 +24477,14 @@ /area/station/commons/storage/tools) "jul" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 + dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ + dir = 10 }, /turf/open/space/basic, /area/space/nearstation) @@ -27411,7 +27404,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 9 + dir = 8 }, /turf/open/space/basic, /area/station/engineering/atmos/space_catwalk) @@ -27930,7 +27923,7 @@ /area/station/science/robotics/augments) "kwH" = ( /obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/plating/airless, @@ -29476,10 +29469,8 @@ /turf/open/floor/iron/small, /area/station/engineering/engine_smes) "kXf" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "kXj" = ( @@ -31846,10 +31837,10 @@ /turf/open/misc/sandy_dirt, /area/station/hallway/primary/central/fore) "lGq" = ( +/obj/structure/fluff/broken_canister_frame, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/structure/fluff/broken_canister_frame, /turf/open/floor/iron, /area/station/engineering/atmos) "lGr" = ( @@ -32220,15 +32211,12 @@ /area/station/hallway/primary/fore) "lLE" = ( /obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ + dir = 10 + }, /turf/open/floor/plating/airless, /area/space/nearstation) "lLH" = ( @@ -33667,7 +33655,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/space_heater, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "mgt" = ( @@ -35117,14 +35107,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/head/cone{ - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/clothing/head/cone{ - pixel_x = -7; - pixel_y = 11 - }, +/obj/structure/tank_holder/extinguisher/advanced, /turf/open/floor/iron, /area/station/engineering/atmos) "mFG" = ( @@ -35445,17 +35428,10 @@ /turf/open/floor/iron/cafeteria, /area/station/service/cafeteria) "mKK" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/station/engineering/atmos) "mKV" = ( /obj/effect/turf_decal/siding/blue{ @@ -36146,16 +36122,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "mXm" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "N2O to Pure" - }, -/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer1{ - dir = 4; - name = "Plasma to Pure"; - color = "#BF40BF" - }, -/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer5{ +/obj/machinery/atmospherics/components/binary/pump/off/general/visible{ dir = 4; name = "CO2 to Pure" }, @@ -36168,13 +36135,11 @@ /turf/open/floor/iron/dark/small, /area/station/medical/storage) "mXx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "N2O to Pure" }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 6 - }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmos) "mXD" = ( /obj/effect/turf_decal/stripes/white/line{ @@ -38511,6 +38476,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/corner, /area/station/science/xenobiology) +"nID" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "nIJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -39602,6 +39574,7 @@ }, /obj/structure/cable, /obj/machinery/firealarm/directional/north, +/obj/machinery/space_heater, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "obe" = ( @@ -42292,10 +42265,15 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "oTY" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/tank_holder/extinguisher/advanced, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) "oTZ" = ( /obj/structure/table, /turf/open/floor/plating, @@ -43283,6 +43261,9 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/tram, /area/station/maintenance/department/medical/central) +"pjk" = ( +/turf/open/floor/iron, +/area/station/engineering/atmos) "pjn" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/dna_scannernew, @@ -45217,8 +45198,9 @@ /area/station/maintenance/port/fore) "pJT" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 }, /turf/open/space/basic, /area/space/nearstation) @@ -47581,18 +47563,9 @@ /turf/open/floor/iron/diagonal, /area/station/hallway/primary/central/aft) "qqr" = ( -/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer5{ +/obj/machinery/atmospherics/components/binary/pump/off/general/visible{ dir = 4; - name = "Air to Pure" - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "N2 to Pure" - }, -/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer1{ - dir = 4; - name = "O2 to Pure" + name = "O2 to pure" }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -48364,7 +48337,8 @@ "qAQ" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/helium_output{ - dir = 8 + dir = 8; + name = "N2O tank output inlet" }, /turf/open/floor/engine/n2o, /area/station/ai_monitored/turret_protected/ai) @@ -49209,6 +49183,13 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/engineering/engine_smes) +"qME" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) "qMG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, @@ -50939,7 +50920,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, @@ -51341,15 +51321,18 @@ /area/station/maintenance/starboard/fore) "rqV" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 + }, /turf/open/space/basic, /area/space/nearstation) "rrb" = ( @@ -51808,10 +51791,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 8; - initialize_directions = 8 - }, +/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/atmos) "rxu" = ( @@ -53611,8 +53591,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -55071,8 +55051,9 @@ /area/station/security/checkpoint/customs/auxiliary) "sqB" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ + dir = 8; + initialize_directions = 8 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -58249,7 +58230,10 @@ /turf/open/floor/iron, /area/station/maintenance/department/engine/atmos) "tnH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "tnO" = ( @@ -60256,6 +60240,10 @@ "tSg" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/light_switch/directional/east, +/obj/item/clothing/head/cone{ + pixel_x = -7; + pixel_y = 11 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "tSh" = ( @@ -61691,6 +61679,13 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/white/small, /area/station/medical/cryo) +"ulf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ull" = ( /obj/machinery/light/cold/directional/west, /turf/open/floor/iron, @@ -61730,13 +61725,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; name = "South Ports to Wastes" }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "umr" = ( @@ -66288,7 +66283,8 @@ "vzK" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/helium_output{ - dir = 4 + dir = 4; + chamber_id = "helium" }, /turf/open/floor/engine/helium, /area/station/ai_monitored/turret_protected/ai) @@ -67432,7 +67428,9 @@ /area/station/maintenance/starboard/central) "vPY" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "vQk" = ( @@ -67707,11 +67705,14 @@ /turf/open/floor/iron, /area/station/security/prison) "vUh" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer1{ + dir = 4; + name = "Plasma to Pure"; + color = "#BF40BF"; + piping_layer = 3; + icon_state = "pump_map-3" }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmos) "vUq" = ( /obj/machinery/restaurant_portal/bar, @@ -68880,7 +68881,9 @@ /area/station/service/chapel) "wlS" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 9 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "wlU" = ( @@ -70721,10 +70724,10 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "wNv" = ( @@ -71436,7 +71439,6 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron, /area/station/engineering/atmos) "wWR" = ( @@ -75780,10 +75782,10 @@ /area/station/maintenance/starboard/aft) "xXl" = ( /obj/structure/table/reinforced, -/obj/structure/showcase/machinery/microwave{ - pixel_y = 7 - }, /obj/effect/turf_decal/bot, +/obj/machinery/microwave{ + pixel_y = 5 + }, /turf/open/floor/iron/small, /area/station/engineering/break_room) "xXr" = ( @@ -85567,7 +85569,7 @@ dDB dDB dDB jhz -hsL +xQZ kpe dDB dDB @@ -85804,8 +85806,8 @@ tYT dDB dDB jul -blb -blb +oTY +qME dDB dDB tYT @@ -85823,7 +85825,7 @@ tYT tYT dDB dDB -blb +hsL pJT rqV dDB @@ -86061,8 +86063,8 @@ giq wBo vmL apj -vmL -vmL +kwH +nID vmL ybO tYT @@ -86080,10 +86082,10 @@ aJq tYT ybO vmL -vmL +hZf kwH lLE -vmL +dqV ybO aJq aJq @@ -86317,9 +86319,9 @@ drw gvB wBo ybO -mKK -cwf -cwf +brC +brC +brC ybO ybO aJq @@ -86337,10 +86339,10 @@ aJq aJq ybO ybO -cwf -pfx brC -ybO +brC +brC +pfx ybO akZ akZ @@ -86575,8 +86577,8 @@ qBD gKs hXt mXm -hXt -hXt +mXx +vUh bJN hYC pwv @@ -86851,9 +86853,9 @@ tSi vnz hYC dYY -dqV -ivT -hZf +ijP +ulf +gCP nkp kvb gBh @@ -87108,7 +87110,7 @@ bSm qxz mRA hvZ -mXx +xHT fJt vPY wPt @@ -87346,7 +87348,7 @@ vtw gKs mFZ exE -tFB +pjk wWP dlk qUN @@ -87603,8 +87605,8 @@ ihj gKs pIB wNi -bPU -yii +tFB +mKK tnH vcR fxV @@ -87860,8 +87862,8 @@ fEr pUK vjK rVA -vUh -oTY +bPU +yii kXf hvo kQr