diff --git a/code/game/machinery/doors/airlock/airlock.dm b/code/game/machinery/doors/airlock/airlock.dm index 7fd4d8f73dfe..ad9feb6bd295 100644 --- a/code/game/machinery/doors/airlock/airlock.dm +++ b/code/game/machinery/doors/airlock/airlock.dm @@ -1220,3 +1220,10 @@ About the new airlock wires panel: /obj/machinery/door/airlock/glass_external/public req_one_access = list() + +/obj/machinery/door/airlock/hatch/supermatter_access + name = "Supermatter Access" + desc = "A reinforced hatch designed to withstand severe environmental hazards." + icon_state = "door_locked" + locked = TRUE + heat_resistance = 120000 diff --git a/maps/triumph/engines/burn.dmm b/maps/triumph/engines/burn.dmm index 47af7f41b62e..0f5c6cc2cabb 100644 --- a/maps/triumph/engines/burn.dmm +++ b/maps/triumph/engines/burn.dmm @@ -167,7 +167,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "gT" = ( /obj/structure/grille, @@ -183,11 +183,11 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "gU" = ( /obj/structure/sign/fire, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "gV" = ( /turf/template_noop, @@ -563,7 +563,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "xl" = ( /obj/machinery/computer/general_air_control/large_tank_control{ @@ -710,7 +710,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Ce" = ( /obj/structure/window/phoronreinforced{ @@ -858,7 +858,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "HF" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ @@ -1041,7 +1041,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "Py" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -1060,7 +1060,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "PH" = ( /obj/machinery/atmospherics/component/binary/circulator{ @@ -1146,7 +1146,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Rn" = ( /obj/machinery/atmospherics/component/binary/pump{ @@ -1311,7 +1311,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "VA" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ @@ -1351,7 +1351,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Wr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1370,6 +1370,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) +"WC" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) "WF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1392,7 +1395,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Xs" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ @@ -1462,15 +1465,15 @@ Dq Dq Dq Dq -KZ +WC JN JN JN JN JN -KZ -KZ -KZ +WC +WC +WC Dq Dq Dq @@ -1491,7 +1494,7 @@ cc gW QA OY -KZ +WC Dq Dq Dq @@ -1512,7 +1515,7 @@ LX cc PA qt -KZ +WC Dq oP Dq @@ -1520,11 +1523,11 @@ Dq Dq "} (4,1,1) = {" -KZ +WC Yi Yi Yi -KZ +WC HD PW LX @@ -1533,15 +1536,15 @@ LX OG PA Ku -KZ +WC Yi hD Yi -KZ -KZ +WC +WC "} (5,1,1) = {" -KZ +WC es Qx Ww @@ -1601,10 +1604,10 @@ zz Gw xU nN -KZ +WC "} (8,1,1) = {" -KZ +WC DU Qx pL @@ -1617,15 +1620,15 @@ tV PL Py GT -KZ -KZ +WC +WC gU Tl Uu -KZ +WC "} (9,1,1) = {" -KZ +WC ey Gn mF @@ -1638,7 +1641,7 @@ AX RE Py jD -KZ +WC gV gV gV @@ -1646,7 +1649,7 @@ gV gV "} (10,1,1) = {" -KZ +WC UK jc Mo @@ -1659,7 +1662,7 @@ ay RU Aq eu -KZ +WC gV gV gV @@ -1667,7 +1670,7 @@ gV gV "} (11,1,1) = {" -KZ +WC as Qy tJ @@ -1680,7 +1683,7 @@ bc RF Um fS -KZ +WC gV gV gV @@ -1688,7 +1691,7 @@ gV gV "} (12,1,1) = {" -KZ +WC oY PH On @@ -1701,7 +1704,7 @@ ay Py Qx je -KZ +WC gV gV gV @@ -1709,7 +1712,7 @@ gV gV "} (13,1,1) = {" -KZ +WC bf WF py @@ -1722,7 +1725,7 @@ uj Py Qx uF -KZ +WC gV gV gV @@ -1730,7 +1733,7 @@ gV gV "} (14,1,1) = {" -KZ +WC ip iB nt @@ -1743,7 +1746,7 @@ nt nF iF IP -KZ +WC gV gV gV @@ -1751,7 +1754,7 @@ gV gV "} (15,1,1) = {" -KZ +WC TK zy nU @@ -1764,7 +1767,7 @@ KZ Bc xl rT -KZ +WC gV gV gV @@ -1772,7 +1775,7 @@ gV gV "} (16,1,1) = {" -KZ +WC mz qH nU @@ -1785,7 +1788,7 @@ KZ ox rX jr -KZ +WC gV gV gV @@ -1793,7 +1796,7 @@ gV gV "} (17,1,1) = {" -KZ +WC VN VN KZ @@ -1814,7 +1817,7 @@ gV gV "} (18,1,1) = {" -KZ +WC Vm Vm pO @@ -1835,7 +1838,7 @@ gV gV "} (19,1,1) = {" -KZ +WC Vm Vm sE diff --git a/maps/triumph/engines/rust.dmm b/maps/triumph/engines/rust.dmm index 0038d472160c..64f13312da64 100644 --- a/maps/triumph/engines/rust.dmm +++ b/maps/triumph/engines/rust.dmm @@ -275,7 +275,7 @@ /area/engineering/engine_room) "aP" = ( /obj/structure/sign/warning/radioactive, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "aY" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ @@ -299,7 +299,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "ck" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -308,7 +308,7 @@ pump_direction = 0; on = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "cx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -348,7 +348,7 @@ /obj/machinery/camera/network/engine{ dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "eD" = ( /obj/machinery/air_alarm{ @@ -425,7 +425,7 @@ id_tag = "engine_sensor"; output = 63 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "iw" = ( /obj/structure/closet/radiation, @@ -487,7 +487,7 @@ id = "EngineVent"; name = "Reactor Vent" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "kJ" = ( /obj/machinery/computer/fusion_fuel_control{ @@ -603,10 +603,10 @@ icon_state = "phoronwindow0" }, /obj/structure/grille, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "os" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "oE" = ( /obj/structure/cable/cyan{ @@ -683,13 +683,13 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "ss" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "sH" = ( /obj/structure/cable/cyan{ @@ -756,7 +756,7 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "wb" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -819,7 +819,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Ab" = ( -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "At" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -856,7 +856,7 @@ id = "cooling_in"; use_power = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "EG" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ @@ -997,7 +997,7 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Kt" = ( /obj/machinery/door/firedoor, @@ -1024,7 +1024,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Lz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ @@ -1051,7 +1051,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "MW" = ( /obj/machinery/atmospherics/component/binary/pump, @@ -1209,7 +1209,7 @@ pump_direction = 0; on = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "RC" = ( /obj/structure/cable/cyan{ @@ -1249,7 +1249,7 @@ id = "cooling_in"; use_power = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Th" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1277,7 +1277,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "UA" = ( /obj/machinery/atmospherics/component/binary/pump{ @@ -1337,7 +1337,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "YK" = ( /obj/machinery/atmospherics/component/binary/pump, diff --git a/maps/triumph/engines/sme.dmm b/maps/triumph/engines/sme.dmm index adce34d916ae..9cf90960a212 100644 --- a/maps/triumph/engines/sme.dmm +++ b/maps/triumph/engines/sme.dmm @@ -43,10 +43,6 @@ /area/engineering/engine_room) "bb" = ( /obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, /obj/structure/window/phoronreinforced{ dir = 8 }, @@ -58,6 +54,9 @@ id = "SupermatterPort"; name = "Reactor Blast Door" }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, /turf/simulated/floor, /area/engineering/engine_room) "bK" = ( @@ -109,9 +108,7 @@ id = "EngineVent"; name = "Reactor Vent" }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "fp" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -167,10 +164,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) -"hJ" = ( -/obj/structure/sign/vacuum, -/turf/simulated/wall/r_wall, -/area/engineering/engine_room) "hR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 @@ -331,8 +324,8 @@ /obj/machinery/camera/network/engine{ dir = 1 }, -/obj/machinery/atmospherics/component/binary/pump{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -367,20 +360,21 @@ pixel_y = -5; req_access = list(10) }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineBlast"; - name = "Engine Monitoring Room Blast Doors"; - pixel_x = -25; - pixel_y = 5; - req_access = list(10) - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 5 }, +/obj/machinery/button/remote/airlock{ + pixel_y = 5; + pixel_x = -25; + desc = "A control for the locking bolts of the access hatch into the containment."; + id = "engine_access_hatch"; + name = "Access Hatch"; + req_access = list(10); + specialfunctions = 4 + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "nV" = ( @@ -413,7 +407,7 @@ /area/engineering/engine_room) "qb" = ( /obj/structure/sign/warning/radioactive, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "qc" = ( /obj/machinery/shield_diffuser, @@ -667,9 +661,6 @@ "zU" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, /obj/structure/window/phoronreinforced{ dir = 8 }, @@ -879,14 +870,11 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "FO" = ( -/obj/machinery/door/airlock/hatch{ - icon_state = "door_locked"; - id_tag = "engine_access_hatch"; - locked = 1; - req_one_access = null - }, /obj/map_helper/access_helper/airlock/station/engineering/engine, -/turf/simulated/floor/reinforced, +/obj/machinery/door/airlock/hatch/supermatter_access{ + id_tag = "engine_access_hatch" + }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "FV" = ( /obj/structure/cable/cyan{ @@ -1315,7 +1303,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "WZ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "Xc" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, @@ -1360,12 +1348,6 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/computer/general_air_control/large_tank_control{ - frequency = 1439; - name = "Reactor Waste Port"; - output_tag = "waste_out"; - sensors = null - }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Yg" = ( @@ -1435,9 +1417,9 @@ Za WZ WZ WZ -hJ dF -hJ +dF +dF WZ WZ WZ diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm index ce0e70bf05a9..ff1464050c5b 100644 --- a/maps/triumph/levels/deck1.dmm +++ b/maps/triumph/levels/deck1.dmm @@ -63,10 +63,10 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "ai" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, /turf/simulated/floor/tiled/techmaint, @@ -301,7 +301,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "aS" = ( @@ -526,8 +526,8 @@ /turf/simulated/floor/tiled/white, /area/engineering/foyer_mezzenine) "by" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -651,8 +651,8 @@ /area/space) "bS" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, @@ -669,6 +669,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"bU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "bV" = ( /obj/structure/atmos_tank_segment/phoron{ icon_state = "4,0" @@ -871,10 +883,16 @@ /turf/simulated/floor/tiled, /area/engineering/hallway/lower) "cK" = ( -/obj/structure/catwalk, -/obj/structure/catwalk, -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/engineering/portnacelle) +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/obj/machinery/meter, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "cM" = ( /obj/structure/atmos_tank_segment/n2o2{ icon_state = "0,3" @@ -966,10 +984,10 @@ /turf/simulated/floor/airless/ceiling, /area/engineering/atmos/gas_storage) "cZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "dc" = ( @@ -1165,7 +1183,7 @@ /obj/structure/atmos_tank_segment/o2{ icon_state = "3,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) "dN" = ( @@ -1561,7 +1579,7 @@ /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/tiled/techmaint, /area/maintenance/engineering) "fb" = ( @@ -1594,8 +1612,8 @@ /turf/simulated/floor/plating, /area/engineering/hallway/lower) "ff" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -1641,16 +1659,10 @@ /turf/simulated/floor/tiled, /area/station/stairs_one) "fn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, /turf/simulated/floor/tiled/techmaint, @@ -1755,6 +1767,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/tiled, /area/engineering/hallway) "fJ" = ( @@ -1840,7 +1853,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "fW" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/meter, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -1856,6 +1869,13 @@ /obj/structure/railing, /turf/space, /area/space) +"gc" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "gf" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -2166,21 +2186,24 @@ /turf/simulated/floor/tiled, /area/engineering/hallway/lower) "ha" = ( -/obj/structure/catwalk, -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/engineering/portnacelle) +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "hb" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/catwalk, /turf/simulated/floor/airless/ceiling, /area/engineering/atmos/gas_storage) "hd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 }, -/obj/machinery/meter, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) +/obj/structure/catwalk, +/turf/simulated/floor/airless/ceiling, +/area/engineering/atmos/gas_storage) "he" = ( /turf/space/basic, /area/space) @@ -2215,14 +2238,18 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/starboardnacelle) "hk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning{ dir = 5 }, /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "hl" = ( @@ -2247,7 +2274,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "hn" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, @@ -2644,7 +2671,10 @@ /turf/simulated/floor/tiled/white, /area/engineering/foyer_mezzenine) "iC" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/obj/machinery/meter, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "iE" = ( @@ -2745,9 +2775,6 @@ }, /turf/simulated/floor/tiled/hydro, /area/engineering/atmos) -"iY" = ( -/turf/simulated/wall/r_wall, -/area/engineering/engine_room) "ja" = ( /obj/structure/table/rack{ dir = 8; @@ -2830,8 +2857,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "jj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -2879,7 +2906,9 @@ /turf/simulated/floor/airless/ceiling, /area/space) "jv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "jy" = ( @@ -3108,6 +3137,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"ke" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/blue{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "kf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3207,9 +3242,8 @@ /area/tcommsat/chamber) "kv" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 + dir = 9 }, -/obj/machinery/meter, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "kw" = ( @@ -3456,10 +3490,10 @@ /turf/simulated/wall/prepainted/engineering, /area/engineering/storage) "lw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "lz" = ( @@ -3726,8 +3760,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -3735,7 +3769,7 @@ /obj/structure/atmos_tank_segment/o2{ icon_state = "1,4" }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/blue, /obj/structure/lattice, /turf/space/basic, /area/engineering/atmos/gas_storage) @@ -3800,7 +3834,7 @@ /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/plating, /area/tcommsat/powercontrol) "mC" = ( @@ -3958,8 +3992,8 @@ /obj/structure/atmos_tank_segment/phoron{ icon_state = "3,1" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos/gas_storage) @@ -4034,7 +4068,7 @@ /turf/simulated/floor/airless/ceiling, /area/engineering/atmos/gas_storage) "nC" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner, @@ -4118,7 +4152,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, /obj/structure/window/reinforced{ @@ -4248,7 +4282,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_monitoring) "oo" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, /obj/machinery/meter, @@ -4341,11 +4375,13 @@ /turf/simulated/floor/tiled, /area/engineering/hallway/lower) "oI" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 6 + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) +/obj/effect/paint_stripe/pipecyan, +/turf/simulated/floor/plating, +/area/space) "oJ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -4392,7 +4428,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "oP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /obj/effect/floor_decal/industrial/warning, @@ -4444,7 +4480,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shunt) "pa" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -4459,8 +4495,8 @@ /obj/structure/atmos_tank_segment/co2{ icon_state = "3,1" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos/gas_storage) @@ -4502,7 +4538,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/visible/red, +/obj/machinery/atmospherics/pipe/manifold4w/visible/black, /obj/machinery/meter, /obj/structure/cable/green{ icon_state = "1-2" @@ -4741,7 +4777,7 @@ /obj/structure/atmos_tank_segment/o2{ icon_state = "3,4" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/lattice, /turf/space/basic, /area/engineering/atmos/gas_storage) @@ -4831,7 +4867,7 @@ /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/atmospherics, /turf/simulated/floor/plating, /area/engineering/atmos/storage) "qr" = ( @@ -4880,7 +4916,7 @@ /obj/structure/atmos_tank_segment/air{ icon_state = "1,3" }, -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) "qz" = ( @@ -4923,7 +4959,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tcommsat/computer) "qD" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ +/obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 4 }, /obj/machinery/meter, @@ -4967,16 +5003,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) "qK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -5100,7 +5130,7 @@ /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/gas_storage) "rb" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, /obj/machinery/meter, @@ -5158,7 +5188,7 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_airlock) "rq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, /obj/effect/floor_decal/industrial/warning{ @@ -5216,9 +5246,7 @@ }, /area/tcommsat/chamber) "ry" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "rA" = ( @@ -5252,8 +5280,8 @@ /obj/structure/atmos_tank_segment/n2o2{ icon_state = "3,1" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/gas_storage) @@ -5337,15 +5365,12 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/locker_room) "rT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "rU" = ( @@ -5480,11 +5505,11 @@ /obj/structure/atmos_tank_segment/n2{ icon_state = "1,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/gas_storage) "sm" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, /obj/effect/floor_decal/industrial/warning{ @@ -5635,7 +5660,7 @@ /turf/simulated/floor/tiled, /area/station/stairs_one) "sR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/catwalk, /turf/simulated/floor/airless/ceiling, /area/engineering/atmos/gas_storage) @@ -5729,7 +5754,7 @@ /obj/structure/atmos_tank_segment/co2{ icon_state = "4,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/structure/lattice, @@ -5929,8 +5954,8 @@ }, /area/tcommsat/chamber) "tH" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -6096,7 +6121,7 @@ /turf/simulated/floor/plating, /area/maintenance/engi_engine) "um" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, /obj/machinery/meter, @@ -6280,7 +6305,7 @@ /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "uM" = ( @@ -6312,7 +6337,7 @@ /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/plating, /area/maintenance/engineering) "uU" = ( @@ -6526,10 +6551,9 @@ /turf/simulated/floor/plating, /area/maintenance/engi_engine) "vN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 }, -/obj/machinery/meter, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vP" = ( @@ -6557,7 +6581,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/workshop) "vT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/black, /obj/structure/catwalk, /turf/simulated/floor/airless/ceiling, /area/engineering/atmos/gas_storage) @@ -6608,7 +6632,7 @@ /turf/simulated/floor/tiled/white, /area/engineering/foyer_mezzenine) "wa" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ +/obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -6630,7 +6654,7 @@ /obj/structure/atmos_tank_segment/o2{ icon_state = "1,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) "we" = ( @@ -6803,8 +6827,8 @@ /obj/structure/atmos_tank_segment/phoron{ icon_state = "4,1" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /obj/structure/lattice, /turf/space/basic, @@ -6888,7 +6912,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_smes) "wV" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -6898,7 +6922,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "wY" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ +/obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, @@ -6907,7 +6931,7 @@ /obj/structure/atmos_tank_segment/air{ icon_state = "1,4" }, -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/structure/lattice, /turf/space/basic, /area/engineering/atmos/gas_storage) @@ -7080,7 +7104,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/visible/red{ +/obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ @@ -7126,11 +7150,11 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "xF" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 }, /turf/simulated/floor/tiled/techmaint, @@ -7263,7 +7287,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "yr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, /obj/effect/floor_decal/industrial/warning{ @@ -7512,8 +7536,8 @@ /obj/structure/atmos_tank_segment/n2o2{ icon_state = "4,1" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /obj/structure/lattice, /turf/space/basic, @@ -7535,14 +7559,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_monitoring) "zf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) +/obj/structure/catwalk, +/turf/simulated/floor/airless/ceiling, +/area/engineering/atmos/gas_storage) "zi" = ( /obj/machinery/air_alarm{ dir = 1; @@ -7701,7 +7723,7 @@ /area/engineering/atmos/monitoring) "zP" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/black, /obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) @@ -7740,15 +7762,10 @@ /turf/simulated/floor/tiled/techmaint, /area/tcommsat/computer) "zV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1 - }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "zX" = ( @@ -8063,8 +8080,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "AV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -8093,8 +8110,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Bc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /obj/machinery/atmospherics/component/binary/pump{ dir = 1 @@ -8276,7 +8293,7 @@ /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) "BI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, /turf/simulated/floor/tiled/techmaint, @@ -8580,6 +8597,12 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/engineering/atmos/storage) +"CK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "CM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8666,8 +8689,8 @@ /obj/structure/atmos_tank_segment/n2o2{ icon_state = "3,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 }, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/gas_storage) @@ -8739,8 +8762,8 @@ /obj/structure/atmos_tank_segment/n2o2{ icon_state = "4,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 }, /obj/structure/lattice, /turf/space/basic, @@ -8809,7 +8832,7 @@ /obj/structure/atmos_tank_segment/n2{ icon_state = "3,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/gas_storage) "Dy" = ( @@ -8843,11 +8866,11 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_airlock) "DD" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 }, -/turf/simulated/wall/prepainted/engineering, -/area/engineering/drone_fabrication) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "DE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, @@ -8878,14 +8901,14 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "DH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "DI" = ( @@ -8923,7 +8946,7 @@ /turf/simulated/floor/plating, /area/maintenance/engi_engine) "DN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /obj/effect/floor_decal/industrial/warning, @@ -9114,7 +9137,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "Ew" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, /obj/machinery/meter, @@ -9125,7 +9148,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/effect/paint_stripe/pipecyan, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/atmos) "EA" = ( @@ -9186,9 +9211,7 @@ /turf/simulated/shuttle/wall/voidcraft/blue, /area/engineering/hallway/lower) "EP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9540,7 +9563,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "FT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -9919,7 +9942,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "Ho" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/light{ dir = 8; light_range = 12 @@ -10083,7 +10106,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, /obj/structure/window/reinforced{ @@ -10197,6 +10220,12 @@ /obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) +"Ij" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/effect/paint_stripe/pipecyan, +/turf/simulated/floor/plating, +/area/engineering/atmos) "Ik" = ( /obj/structure/cable{ icon_state = "0-4" @@ -10296,7 +10325,7 @@ /turf/simulated/floor/tiled, /area/station/stairs_one) "IC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 5 }, /obj/machinery/meter, @@ -10535,14 +10564,14 @@ /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/computer) "Jn" = ( /obj/structure/atmos_tank_segment/n2{ icon_state = "1,4" }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/lattice, /turf/space/basic, /area/engineering/atmos/gas_storage) @@ -10563,8 +10592,8 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "Jp" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 6 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -10607,7 +10636,7 @@ /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) "Jz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 }, /obj/machinery/light, @@ -10644,7 +10673,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_airlock) "JE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, /obj/machinery/computer/general_air_control/large_tank_control{ @@ -10787,14 +10816,14 @@ /turf/simulated/floor/plating, /area/engineering/hallway/lower) "JZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /obj/structure/catwalk, /turf/simulated/floor/airless/ceiling, /area/engineering/atmos/gas_storage) "Kb" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -10836,7 +10865,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Km" = ( @@ -10880,8 +10909,8 @@ }, /area/tcommsat/chamber) "Kt" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -10899,8 +10928,8 @@ /obj/structure/atmos_tank_segment/co2{ icon_state = "4,1" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /obj/structure/lattice, /turf/space/basic, @@ -11117,12 +11146,6 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/locker_room) "Lj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, @@ -11278,6 +11301,11 @@ /obj/structure/catwalk, /turf/space, /area/space) +"LI" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/structure/catwalk, +/turf/simulated/floor/airless/ceiling, +/area/engineering/atmos/gas_storage) "LJ" = ( /obj/structure/atmos_tank_segment/air{ icon_state = "1,2" @@ -11300,7 +11328,7 @@ /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) "LK" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 4 }, /obj/machinery/computer/general_air_control/large_tank_control{ @@ -11754,8 +11782,8 @@ /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/drone_fabrication) "Nn" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled/techmaint, @@ -11834,9 +11862,8 @@ /turf/simulated/floor/tiled/white, /area/engineering/foyer_mezzenine) "NB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -11949,13 +11976,7 @@ /turf/space/basic, /area/space) "Oa" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -11964,7 +11985,7 @@ /turf/simulated/wall/prepainted, /area/maintenance/trash_pit) "Od" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 }, /obj/machinery/power/apc/north_mount{ @@ -12004,12 +12025,12 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "Oh" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow, /obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Oj" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ +/obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -12053,8 +12074,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "Op" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -12343,7 +12364,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway/lower) "Pa" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Pc" = ( @@ -12478,7 +12499,7 @@ /obj/structure/atmos_tank_segment/n2{ icon_state = "3,4" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/black, /obj/structure/lattice, /turf/space/basic, /area/engineering/atmos/gas_storage) @@ -12812,6 +12833,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "QN" = ( @@ -12904,8 +12928,10 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Re" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Rf" = ( @@ -13130,7 +13156,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, @@ -13327,7 +13353,7 @@ /turf/space/basic, /area/engineering/atmos/gas_storage) "Sx" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ @@ -13359,7 +13385,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/engineering/atmos/storage) "SE" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ @@ -13664,7 +13690,7 @@ /obj/structure/atmos_tank_segment/co2{ icon_state = "3,3" }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -13736,8 +13762,17 @@ /turf/simulated/floor/plating, /area/maintenance/engi_engine) "TU" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/maintenance/dormitory) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "TV" = ( /obj/structure/table/reinforced, /obj/item/toy/plushie/carp/nebula, @@ -13864,7 +13899,12 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "Uo" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "Up" = ( @@ -14054,14 +14094,14 @@ /area/engineering/hallway/lower) "UR" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 8 }, /obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/space) "UV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -14258,16 +14298,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "VC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "VG" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ @@ -14505,6 +14545,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/computer) +"Wo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "Wr" = ( /obj/structure/cable{ icon_state = "0-2" @@ -14766,7 +14812,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "Xs" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/camera/network/engineering{ dir = 4 }, @@ -14887,6 +14933,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/engineering/hallway) +"XH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos) "XI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/carpet/blucarpet, @@ -14986,7 +15038,7 @@ /turf/simulated/floor/plating, /area/station/stairs_one) "Ya" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, /turf/simulated/floor/tiled/techmaint, @@ -15074,18 +15126,15 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/locker_room) "Yl" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos) "Ym" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -15129,7 +15178,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/effect/paint_stripe/pipecyan, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, /turf/simulated/floor/plating, /area/space) "Ys" = ( @@ -15187,6 +15238,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/tiled, /area/engineering/hallway) "YB" = ( @@ -15295,8 +15347,9 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "YV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -15365,7 +15418,7 @@ /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/department, /turf/simulated/floor/plating, /area/maintenance/trash_pit) "Zi" = ( @@ -15587,12 +15640,9 @@ /turf/space, /area/space) "ZO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "ZP" = ( @@ -15637,9 +15687,9 @@ /turf/simulated/floor/plating, /area/maintenance/engi_engine) "ZT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -27038,7 +27088,7 @@ cD cD cD cD -iY +cD cD cD cD @@ -29929,7 +29979,7 @@ TP Xx SP EZ -ha +EZ Bx Bx Bx @@ -30123,13 +30173,13 @@ ab Ps SP LH -ha -cK -ha -ha -ha -ha -ha +EZ +EZ +EZ +EZ +EZ +EZ +EZ EZ Wl ME @@ -30156,12 +30206,12 @@ fj yE Hg kw -TU -TU -TU -TU -TU -TU +st +st +st +st +st +st SP KW he @@ -33265,13 +33315,13 @@ JZ tu dW oy -qZ +hd tu JZ oy dW oy -qZ +zf tu JZ dW @@ -33459,7 +33509,7 @@ Ey xX bQ bQ -Yr +oI Hq UR bQ @@ -33649,19 +33699,19 @@ Km yh jl hZ -IM +wb Vl Vl -yh -jl +cK +jd il -IM -vN +wb +um Xs Ho -jl +jj eD -IM +wb xX oy Yq @@ -33842,19 +33892,19 @@ Vl Vl xw BI -Xi -rw +qf +jj Vl Vl -xw +vN BI -Xi +qf ai -jl +jj Vl Vl um -Xi +qf VC gh sR @@ -34032,23 +34082,23 @@ xz Gt xC AV -tk -qm +Jp +ry Kl RB -qm -qm +ry +ry fW -qm -Ym +ry +ha tM -qm +ry Ym fW -qm -qm +ry +ry Jc -Jp +FX JE WF tu @@ -34226,7 +34276,7 @@ ax Bs xC hy -YV +UV Vl GJ mX @@ -34234,16 +34284,16 @@ oJ Vl Vl Vl -GJ +NB mX oJ -GJ +DD mX oJ Vl Nn -hd -NB +lB +Ns zP vT PH @@ -34420,7 +34470,7 @@ Em oD xC AV -YV +UV Vl Pz Vl @@ -34432,9 +34482,9 @@ Pz Vl Vl Pz -oI +tk wY -jv +qm lw wY rb @@ -34586,7 +34636,7 @@ Zh mD Ru PZ -DD +bA fk qP Kr @@ -34616,19 +34666,19 @@ yV Op tH HQ -ry -aO -aO -aO +ZO +Xi +Xi +Xi Ew hn Kb -aO -aO +Xi +Xi Pa Pz Or -vU +aO cZ ZT IC @@ -34808,24 +34858,24 @@ Tu Tu xC ml -YV +UV Jj Vl qn qn qn -jj -jj +IM +IM Vl Vl Vl -GJ -jl +by +rw wb zq Bc -jd -es +kv +CK xX oy cX @@ -35012,16 +35062,16 @@ Ba RS EW Vl -Uo +Vl ZO oo Mv Vl SX -Jp -hm -df -EI +FX +ke +Ij +LI mm wd bB @@ -35206,13 +35256,13 @@ HM Oh xX WK -iC -EP -jj +Vl +Vl +IM wb xI UV -IM +wb LK WF tu @@ -35396,20 +35446,20 @@ yp Lo YL eN -vW +Uo nC VG SE RP fn -jj +IM wb fO UV -hd +lB Kt -zP -vT +zJ +hb qg dL eY @@ -35590,17 +35640,17 @@ gu gu gu at -vW +rT oP vk vk vk qK -ry +ZO Dd wa ff -vU +aO Jz xX oy @@ -35784,7 +35834,7 @@ zO zO al YO -vW +rT wV Sx sm @@ -35978,16 +36028,16 @@ OF Cx UW vj -vW +bU DN iW QI vW -zV -qf +hm +vU xE -FX -kv +Wo +Nn Vl Vl xX @@ -36172,20 +36222,20 @@ Rk oS Uu vj -vW +TU FT Ys Ys II -rT -pa +es +Vl wb -lB -Ns -qf -qf -zJ -hb +iC +YV +vU +vU +df +EI xa qy LJ @@ -36369,10 +36419,10 @@ Lk hk DH Re -Re -Re -Oa -zf +XH +Vl +es +Vl wb Vl UV @@ -36562,14 +36612,14 @@ Qs Nd ur nR -Vl -Vl +Oa +pa Vl es -by +Vl HN qf -Ns +gc qf qf zJ @@ -36756,8 +36806,8 @@ bz Nd Up kd -vU -vU +EP +zV vU dz gq @@ -36951,7 +37001,7 @@ bu JV Ao QM -Vl +jv PG jV Ya