From 4e4ad9881d958d2b3c823ad61984d37d82d76d69 Mon Sep 17 00:00:00 2001 From: Ferner Date: Tue, 23 Feb 2021 01:37:57 +0100 Subject: [PATCH] Atmos and thrusters hookup --- aurorastation.dme | 1 + .../overmap/ships/engines/gas_thruster.dm | 3 + icons/turf/placeholder_tanks.dmi | Bin 7712 -> 9197 bytes .../code/placeholder_structures.dm | 58 + maps/placeholder/placeholder-1_deck_1.dmm | 3137 +++++++++++------ maps/placeholder/placeholder-2_deck_2.dmm | 4 +- maps/placeholder/placeholder-3_deck_3.dmm | 6 +- 7 files changed, 2188 insertions(+), 1021 deletions(-) create mode 100644 maps/placeholder/code/placeholder_structures.dm diff --git a/aurorastation.dme b/aurorastation.dme index 0f732889bb8..22440b08179 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2963,6 +2963,7 @@ #include "maps\placeholder\code\placeholder_outfits.dm" #include "maps\placeholder\code\placeholder_overmap.dm" #include "maps\placeholder\code\placeholder_shuttles.dm" +#include "maps\placeholder\code\placeholder_structures.dm" #include "maps\placeholder\code\placeholder_unittest.dm" #include "maps\runtime\code\runtime.dm" #include "maps\runtime\code\runtime_lifts.dm" diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index e5619c0190d..494a0a74d26 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -80,6 +80,9 @@ opacity = FALSE pixel_x = -64 +/obj/machinery/atmospherics/unary/engine/placeholder/check_blockage() + return 0 + /obj/machinery/atmospherics/unary/engine/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) return 0 diff --git a/icons/turf/placeholder_tanks.dmi b/icons/turf/placeholder_tanks.dmi index fac3509725766cbc7308385483195a1eccc3b3fb..d340be624326df880d0d444640a0c1681234f755 100644 GIT binary patch literal 9197 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 diff --git a/maps/placeholder/code/placeholder_structures.dm b/maps/placeholder/code/placeholder_structures.dm new file mode 100644 index 00000000000..e95802b611f --- /dev/null +++ b/maps/placeholder/code/placeholder_structures.dm @@ -0,0 +1,58 @@ +/obj/structure/tank_wall + name = "mixed gas tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains mixed gasses." + density = TRUE + anchored = TRUE + opacity = TRUE + icon = 'icons/turf/placeholder_tanks.dmi' + icon_state = "m-1" + + atmos_canpass = CANPASS_DENSITY + +/obj/structure/tank_wall/Initialize(mapload) + . = ..() + if(!mapload) + update_nearby_tiles() + +/obj/structure/tank_wall/ex_act(severity) + if(severity == 1.0) + qdel(src) + +/obj/structure/tank_wall/Destroy() + update_nearby_tiles() + return ..() + +/obj/structure/tank_wall/phoron + name = "phoron gas tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains phoron." + icon_state = "ph1" + +/obj/structure/tank_wall/oxygen + name = "oxygen tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains oxygen." + icon_state = "o2-1" + +/obj/structure/tank_wall/hydrogen + name = "hydrogen tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains hydrogen." + icon_state = "h1" + +/obj/structure/tank_wall/carbon_dioxide + name = "carbon dioxide tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains carbon dioxide." + icon_state = "co2-1" + +/obj/structure/tank_wall/nitrogen + name = "nitrogen tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains nitrogen." + icon_state = "n1" + +/obj/structure/tank_wall/air + name = "air tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains air." + icon_state = "air1" + +/obj/structure/tank_wall/nitrous_oxide + name = "nitrous oxide tank" + desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains nitrous oxide." + icon_state = "h1" \ No newline at end of file diff --git a/maps/placeholder/placeholder-1_deck_1.dmm b/maps/placeholder/placeholder-1_deck_1.dmm index dc61fe288c3..c513060e218 100644 --- a/maps/placeholder/placeholder-1_deck_1.dmm +++ b/maps/placeholder/placeholder-1_deck_1.dmm @@ -7,6 +7,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"ac" = ( +/obj/structure/bed/chair/office/bridge/pilot, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "ae" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -178,6 +182,12 @@ /obj/machinery/atmospherics/pipe/zpipe/up/black, /turf/space/dynamic, /area/template_noop) +"aG" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,8" + }, +/area/template_noop) "aH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -220,12 +230,15 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "aN" = ( -/obj/machinery/atmospherics/binary/passive_gate{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/binary/passive_gate{ + dir = 8; + icon_state = "on"; + target_pressure = 15000; + unlocked = 1 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "aO" = ( @@ -430,11 +443,13 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "bl" = ( -/obj/machinery/atmospherics/binary/pump, +/obj/machinery/atmospherics/binary/pump{ + name = "Mix to Connectors" + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "bm" = ( -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "bo" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -484,7 +499,7 @@ /area/quartermaster/storage) "bv" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/valve, +/obj/machinery/atmospherics/valve/open, /turf/space/dynamic, /area/template_noop) "bw" = ( @@ -501,13 +516,11 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "by" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-15"; - name = "tank" +/obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-15" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/engineering/atmos/air) "bA" = ( @@ -524,11 +537,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, -/obj/machinery/power/apc/super/critical{ - pixel_y = -24 - }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/engineering/atmos/air) @@ -599,14 +609,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/test_range) -"bN" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/blast/regular, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/engineering/atmos/air) "bO" = ( /obj/machinery/light{ dir = 8 @@ -624,7 +626,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos/air) "bR" = ( /obj/structure/window/shuttle/placeholder, @@ -643,6 +645,16 @@ }, /turf/simulated/floor/tiled, /area/hangar/intrepid) +"bU" = ( +/obj/machinery/computer/general_air_control/large_tank_control/wall{ + input_tag = "air_in"; + name = "Air Supply Monitor"; + output_tag = "air_out"; + pixel_y = -3; + sensors = list("air_sensor" = "Tank") + }, +/turf/simulated/wall/r_wall, +/area/engineering/atmos/air) "bW" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4 @@ -675,7 +687,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "cb" = ( -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "cc" = ( /obj/effect/floor_decal/industrial/warning{ @@ -687,13 +699,29 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "cf" = ( -/obj/machinery/atmospherics/omni/mixer, +/obj/machinery/atmospherics/omni/mixer{ + active_power_usage = 7500; + tag_east = 1; + tag_east_con = 0.2; + tag_north = 1; + tag_north_con = 0.8; + tag_west = 2 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "cg" = ( /obj/machinery/door/airlock/glass_research, /turf/simulated/floor/tiled/dark, /area/rnd/eva) +"ch" = ( +/obj/machinery/computer/general_air_control/large_tank_control{ + input_tag = "ph_in"; + name = "Phoron Supply Monitor"; + output_tag = "ph_out"; + sensors = list("ph_sensor" = "Tank") + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "ci" = ( /turf/simulated/floor/tiled/dark, /area/janitor) @@ -708,12 +736,13 @@ /turf/simulated/floor/reinforced, /area/hangar/control) "cn" = ( -/obj/machinery/atmospherics/pipe/tank/oxygen{ - dir = 8 - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/machinery/meter, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "co" = ( @@ -727,6 +756,13 @@ /obj/structure/lattice/catwalk/indoor, /turf/space/dynamic, /area/template_noop) +"cr" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + frequency = 1441; + id_tag = "co2_out" + }, +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/engineering/atmos) "cs" = ( /obj/structure/shuttle_part/mercenary/small{ icon_state = "7,1" @@ -794,13 +830,17 @@ /turf/simulated/floor/tiled/white, /area/rnd/isolation_c) "cA" = ( -/obj/machinery/air_sensor, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 5 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "n2o_sensor" + }, +/obj/effect/decal/fake_object/light_source/invisible, +/turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "cB" = ( /obj/structure/table/stone/marble, @@ -831,6 +871,7 @@ /area/quartermaster/loading) "cF" = ( /obj/machinery/atmospherics/omni/filter{ + name = "phoron filter"; tag_east = 2; tag_north = 6; tag_west = 1 @@ -847,6 +888,13 @@ /obj/machinery/artifact_scanpad, /turf/simulated/floor/bluegrid, /area/rnd/xenoarch_atrium) +"cJ" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "cK" = ( /obj/machinery/door/airlock/mining, /obj/structure/cable/green{ @@ -870,7 +918,10 @@ /area/medical/morgue/lower) "cO" = ( /obj/machinery/atmospherics/binary/passive_gate{ - dir = 4 + dir = 4; + icon_state = "on"; + target_pressure = 15000; + unlocked = 1 }, /obj/structure/cable{ icon_state = "4-8" @@ -884,10 +935,11 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "cR" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/turf/simulated/wall/shuttle/placeholder/cardinal, +/obj/effect/map_effect/wingrille_spawn/reinforced_phoron, +/turf/simulated/floor/plating, /area/engineering/atmos/air) "cS" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -899,7 +951,7 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos/air) "cU" = ( /obj/structure/shuttle_part/mercenary/small{ @@ -916,7 +968,7 @@ /obj/machinery/sparker{ pixel_x = 22 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos/air) "cX" = ( /obj/machinery/door/airlock/mining, @@ -980,6 +1032,12 @@ }, /turf/simulated/floor/tiled, /area/medical/emergency_storage) +"dg" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,3" + }, +/area/template_noop) "dh" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/airlock/hatch, @@ -1081,7 +1139,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/machinery/atmospherics/binary/pump, +/obj/machinery/atmospherics/binary/pump{ + name = "Hydrogen to Mix" + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "dx" = ( @@ -1116,6 +1176,20 @@ }, /turf/simulated/floor/tiled, /area/hallway/engineering) +"dE" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "15,7" + }, +/turf/simulated/floor/plating, +/area/template_noop) +"dF" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + frequency = 1441; + id_tag = "o2_out" + }, +/turf/simulated/floor/reinforced/oxygen, +/area/engineering/atmos/air) "dG" = ( /turf/simulated/wall/shuttle/unique/mercenary/small{ icon_state = "1,8" @@ -1174,6 +1248,15 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/briefing) +"dM" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/tank/oxygen{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/air) "dN" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -1204,31 +1287,43 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "dR" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + frequency = 1441; + icon_state = "map_vent_in"; + id_tag = "mixed_out"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + name = "mixed gas vent"; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0; + use_power = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos) "dS" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-6"; - name = "tank" +/obj/structure/tank_wall{ + density = 0; + icon_state = "m-6"; + layer = 10.1; + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos) "dT" = ( +/obj/structure/tank_wall{ + icon_state = "m-7" + }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-7"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, @@ -1263,9 +1358,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/meter, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "dZ" = ( @@ -1276,15 +1369,13 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "ea" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph4"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph4" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "eb" = ( /obj/structure/lattice, @@ -1294,16 +1385,23 @@ "ec" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "ed" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 1 + dir = 1; + name = "Connectors to Mix" }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"ee" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,6" + }, +/area/template_noop) "ef" = ( /obj/structure/shuttle_part/placeholder{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -1329,12 +1427,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "ek" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/hydrogen{ + density = 0; icon_state = "h6"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "el" = ( /turf/simulated/floor/tiled/dark, @@ -1350,15 +1449,13 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "eo" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph13"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph13" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "ep" = ( /obj/machinery/door/airlock/glass_atmos, @@ -1393,15 +1490,20 @@ icon_state = "1,7" }, /area/shuttle/escape_pod) -"ew" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n3"; - name = "tank" +"eu" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + frequency = 1441; + id_tag = "ph_out" }, +/turf/simulated/floor/reinforced/phoron, +/area/engineering/atmos) +"ew" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n3" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "ey" = ( @@ -1427,14 +1529,12 @@ }, /area/shuttle/escape_pod) "eB" = ( +/obj/structure/tank_wall{ + icon_state = "m-13" + }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-13"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, @@ -1498,15 +1598,21 @@ /area/shuttle/escape_pod) "eI" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 4 + dir = 4; + name = "Waste to Filtering"; + use_power = 1 }, /turf/simulated/floor/plating, /area/engineering/atmos) "eJ" = ( /obj/machinery/computer/general_air_control/large_tank_control/wall{ - pixel_y = -3 + input_tag = "mixed_in"; + name = "Mixed Gas Tank Monitor"; + output_tag = "mixed_out"; + pixel_y = -3; + sensors = list("mixed_sensor" = "Tank") }, -/turf/simulated/wall/placeholder_standard, +/turf/simulated/wall/r_wall, /area/engineering/atmos) "eL" = ( /obj/effect/floor_decal/corner_wide/purple{ @@ -1603,15 +1709,13 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "fb" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h4" + }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h4"; - name = "tank" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "fc" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ @@ -1722,13 +1826,14 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "fx" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/tank_wall/nitrous_oxide{ + density = 0; icon_state = "h11"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/red, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "fy" = ( /obj/structure/shuttle_part/placeholder{ @@ -1768,6 +1873,13 @@ /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"fE" = ( +/obj/effect/decal/cleanable/draftingchalk/blue, +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "11,9" + }, +/area/template_noop) "fF" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -1863,22 +1975,21 @@ }, /area/shuttle/escape_pod) "fQ" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/hydrogen{ + density = 0; icon_state = "h5"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "fS" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n7"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n7" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "fU" = ( @@ -1926,15 +2037,13 @@ }, /area/shuttle/escape_pod) "fY" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h8" + }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h8"; - name = "tank" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "fZ" = ( /obj/machinery/light/small/emergency, @@ -1944,6 +2053,15 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/maintenance/vault) "ga" = ( @@ -1986,11 +2104,14 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" }, /turf/simulated/floor/tiled/ramp/bottom{ dir = 4 @@ -2010,14 +2131,19 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "gk" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h15"; - name = "tank" +/obj/structure/tank_wall/hydrogen{ + icon_state = "h15" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/airless, /area/engineering/atmos) +"gl" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "8,1"; + opacity = 0 + }, +/area/template_noop) "gn" = ( /obj/structure/ladder/up{ pixel_y = 13 @@ -2047,17 +2173,25 @@ }, /area/shuttle/escape_pod) "gr" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h1"; - name = "tank" - }, +/obj/structure/tank_wall/hydrogen, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) +"gs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/railing/mapped, +/obj/structure/tank_wall/hydrogen{ + icon_state = "h11" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "gt" = ( /obj/effect/decal/cleanable/draftingchalk/blue, /turf/simulated/wall/shuttle/unique/merchant{ @@ -2066,8 +2200,11 @@ }, /area/shuttle/escape_pod) "gu" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos, -/turf/simulated/floor/reinforced, +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + frequency = 1441; + id_tag = "h_out" + }, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "gv" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -2104,16 +2241,12 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/escape_pod) "gA" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-1"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/carbon_dioxide, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "gB" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -2122,14 +2255,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "gC" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-2"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-2" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "gD" = ( @@ -2158,13 +2289,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-3"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-3" }, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "gI" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -2181,8 +2310,9 @@ /area/shuttle/escape_pod) "gL" = ( /obj/machinery/atmospherics/omni/filter{ + name = "nitrogen filter"; tag_east = 2; - tag_north = 6; + tag_north = 4; tag_west = 1 }, /turf/simulated/floor/plating, @@ -2323,6 +2453,13 @@ /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +"hf" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "6,1"; + opacity = 0 + }, +/area/template_noop) "hg" = ( /obj/structure/table/rack{ dir = 8; @@ -2382,8 +2519,8 @@ /turf/simulated/floor/tiled/ramp, /area/hangar/control) "hn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red, -/turf/simulated/floor/reinforced, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "ho" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -2402,14 +2539,12 @@ /turf/simulated/wall/shuttle/placeholder/cardinal, /area/maintenance/vault) "hr" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h10"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "h10" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "hs" = ( @@ -2446,12 +2581,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "hv" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/carbon_dioxide{ + density = 0; icon_state = "co2-5"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "hy" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -2467,6 +2603,13 @@ opacity = 0 }, /area/shuttle/escape_pod) +"hB" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Connectors to Filtering" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "hC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2513,6 +2656,15 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/vault) "hJ" = ( @@ -2522,14 +2674,12 @@ }, /area/shuttle/escape_pod) "hK" = ( +/obj/structure/tank_wall{ + icon_state = "m-3" + }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-3"; - name = "tank" - }, /turf/simulated/floor/plating, /area/engineering/atmos) "hL" = ( @@ -2620,6 +2770,12 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) +"hY" = ( +/obj/machinery/atmospherics/binary/pump/high_power{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/air) "hZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 @@ -2638,6 +2794,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) +"ib" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "ic" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -2651,22 +2811,23 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "id" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air8"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/air{ + icon_state = "air8" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "ie" = ( -/obj/machinery/air_sensor, /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "co2_sensor" + }, /obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "ig" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2675,9 +2836,12 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "ih" = ( -/obj/machinery/pipedispenser, -/turf/simulated/floor/plating, -/area/maintenance/vault) +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/air) "ii" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -2692,15 +2856,13 @@ }, /area/hallway/engineering) "in" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph10"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph10" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "io" = ( /obj/machinery/conveyor, @@ -2955,6 +3117,12 @@ }, /turf/simulated/floor/plating, /area/hangar/cargo) +"je" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,7" + }, +/area/template_noop) "jf" = ( /obj/machinery/atmospherics/binary/passive_gate{ dir = 1; @@ -3014,6 +3182,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/hangar/briefing) +"jm" = ( +/obj/structure/window/shuttle/unique/raider{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "8,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "jn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3052,6 +3227,13 @@ /obj/machinery/door/window/northright, /turf/simulated/floor/tiled/dark, /area/medical/morgue/lower) +"jy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "jA" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -3062,15 +3244,17 @@ }, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) +"jD" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos/air) "jE" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-3"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-3" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "jF" = ( @@ -3095,7 +3279,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/fake_object/light_source/invisible, /turf/simulated/floor/plating, /area/engineering/atmos/air) "jI" = ( @@ -3181,13 +3364,14 @@ /turf/simulated/floor/tiled, /area/medical/morgue/lower) "jX" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/phoron{ + density = 0; icon_state = "ph12"; - name = "tank" + layer = 10.1; + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "jZ" = ( /obj/machinery/door/airlock/glass_centcom, @@ -3290,6 +3474,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hangar/intrepid) +"km" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + id = "co2_in"; + name = "carbon dioxide injector"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/engineering/atmos) "kn" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ @@ -3479,7 +3672,8 @@ /area/hangar/auxiliary) "kP" = ( /obj/machinery/atmospherics/omni/filter{ - tag_east = 6; + name = "oxygen filter"; + tag_east = 3; tag_north = 1; tag_south = 2 }, @@ -3521,14 +3715,12 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "kU" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h3"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "h3" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "kV" = ( @@ -3611,6 +3803,13 @@ icon_state = "1,14" }, /area/shuttle/escape_pod) +"lk" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "5,2"; + opacity = 0 + }, +/area/template_noop) "ll" = ( /obj/machinery/atmospherics/pipe/tank/oxygen, /turf/simulated/floor/plating, @@ -3654,6 +3853,13 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) +"ls" = ( +/obj/effect/decal/cleanable/draftingchalk/blue, +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "3,9" + }, +/area/template_noop) "lt" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/black, /obj/structure/cable{ @@ -3664,10 +3870,18 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) +"lu" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,3" + }, +/turf/simulated/floor/plating, +/area/template_noop) "lv" = ( /obj/machinery/atmospherics/omni/filter{ + name = "hydrogen filter"; tag_east = 2; - tag_north = 6; + tag_north = 8; tag_south = 1 }, /turf/simulated/floor/tiled/dark, @@ -3698,23 +3912,19 @@ /turf/simulated/floor/reinforced, /area/turret_protected/ai) "lC" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air14"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/air{ + icon_state = "air14" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "lD" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air13"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/air{ + icon_state = "air13" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "lG" = ( @@ -3734,6 +3944,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"lK" = ( +/obj/structure/window/shuttle/unique/raider{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi' + }, +/turf/simulated/floor/plating, +/area/template_noop) "lL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3795,12 +4011,13 @@ /turf/simulated/floor/tiled, /area/medical/morgue/lower) "lW" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/oxygen{ + density = 0; icon_state = "o2-5"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "lY" = ( /obj/structure/lattice, @@ -3855,6 +4072,10 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"me" = ( +/obj/machinery/pipedispenser/disposal, +/turf/simulated/floor/plating, +/area/maintenance/vault) "mf" = ( /obj/machinery/artifact_harvester{ pixel_y = 1 @@ -3911,12 +4132,13 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) "ml" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/nitrous_oxide{ + density = 0; icon_state = "h6"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "mn" = ( /turf/simulated/wall/shuttle/unique/mercenary/small{ @@ -3967,10 +4189,10 @@ /turf/simulated/floor/tiled/dark, /area/medical/morgue/lower) "mx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ +/obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 10 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "my" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4040,6 +4262,7 @@ /area/maintenance/substation/supply) "mL" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/meter, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "mM" = ( @@ -4143,12 +4366,30 @@ /obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/quartermaster/loading) +"nd" = ( +/obj/structure/tank_wall{ + icon_state = "m-10" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) "ne" = ( /obj/effect/floor_decal/industrial/loading/yellow, /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/quartermaster/loading) +"ng" = ( +/obj/machinery/atmospherics/omni/filter{ + name = "carbon dioxide filter"; + tag_east = 2; + tag_north = 5; + tag_west = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "nh" = ( /obj/structure/shuttle_part/placeholder{ icon = 'icons/turf/shuttles_unique/HTS_Canary.dmi'; @@ -4167,6 +4408,13 @@ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi' }, /area/shuttle/escape_pod) +"nk" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "4,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "nl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4359,13 +4607,14 @@ }, /area/shuttle/escape_pod) "nT" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h12"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/reinforced, +/obj/structure/tank_wall/hydrogen{ + density = 0; + icon_state = "h12"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "nU" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ @@ -4373,6 +4622,13 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"nX" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "11,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "nY" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -4417,9 +4673,12 @@ /area/quartermaster/storage) "od" = ( /obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + id = "o2_in"; + name = "oxygen injector"; use_power = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "oe" = ( /obj/effect/floor_decal/industrial/warning{ @@ -4458,6 +4717,13 @@ temperature = 278 }, /area/crew_quarters/kitchen/freezer) +"ol" = ( +/obj/structure/window/shuttle/unique/raider{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "7,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "om" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -4484,6 +4750,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hangar/auxiliary) +"oq" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Nitrogen to Connector" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "or" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -4571,6 +4844,13 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"oE" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "5,1" + }, +/turf/simulated/floor/plating, +/area/template_noop) "oF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4589,6 +4869,13 @@ "oG" = ( /turf/simulated/wall/r_wall, /area/rnd/test_range) +"oJ" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,7" + }, +/turf/simulated/floor/plating, +/area/template_noop) "oK" = ( /obj/structure/cable{ icon_state = "1-8" @@ -4702,15 +4989,16 @@ /turf/simulated/floor/plating, /area/maintenance/substation/supply) "pa" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n12"; - name = "tank" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/green{ +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/turf/simulated/floor/reinforced, +/obj/structure/tank_wall/nitrogen{ + density = 0; + icon_state = "n12"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "pb" = ( /obj/structure/window/shuttle/unique/raider{ @@ -4723,11 +5011,29 @@ /obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor/plating, /area/maintenance/vault) +"pd" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "12,1" + }, +/obj/structure/window/shuttle/unique/raider{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "9,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "pf" = ( /turf/unsimulated/wall/fakepdoor{ dir = 4 }, /area/hangar/auxiliary) +"pi" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "pj" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -4735,15 +5041,13 @@ /turf/space/dynamic, /area/template_noop) "pk" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph8"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph8" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "pl" = ( /obj/structure/cable{ @@ -5013,6 +5317,12 @@ /obj/machinery/suspension_gen, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) +"qh" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,9" + }, +/area/template_noop) "qi" = ( /turf/unsimulated/wall/fakepdoor{ dir = 4 @@ -5028,8 +5338,8 @@ }, /area/shuttle/escape_pod) "qm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue, -/turf/simulated/floor/reinforced, +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "qp" = ( /turf/unsimulated/wall/fakepdoor{ @@ -5081,6 +5391,12 @@ icon_state = "13,13" }, /area/shuttle/escape_pod) +"qx" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,8" + }, +/area/template_noop) "qz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -5099,14 +5415,25 @@ "qA" = ( /turf/simulated/floor/plating, /area/quartermaster/loading) +"qB" = ( +/obj/effect/decal/cleanable/draftingchalk/blue, +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "4,9" + }, +/area/template_noop) "qC" = ( /turf/simulated/wall/placeholder_standard, /area/outpost/mining_main/refinery) "qD" = ( -/obj/machinery/air_sensor, -/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/reinforced, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "mixed_sensor" + }, +/obj/effect/decal/fake_object/light_source/invisible, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos) "qE" = ( /obj/effect/floor_decal/industrial/warning, @@ -5189,14 +5516,12 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/escape_pod) "qQ" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h9"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "n2o9" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "qR" = ( @@ -5259,14 +5584,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) "ra" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-13"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-13" + }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, @@ -5340,15 +5663,17 @@ /obj/item/storage/firstaid/regular, /turf/simulated/floor/shuttle/black, /area/shuttle/escape_pod) +"rl" = ( +/obj/machinery/door/airlock/research, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "rm" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h8"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "n2o8" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "rn" = ( @@ -5385,6 +5710,14 @@ "rr" = ( /turf/simulated/wall/r_wall, /area/hallway/engineering) +"rs" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "4,3"; + opacity = 1 + }, +/turf/simulated/floor/plating, +/area/template_noop) "rt" = ( /obj/structure/table/rack, /obj/item/clothing/mask/breath, @@ -5406,6 +5739,20 @@ /obj/machinery/power/terminal, /turf/simulated/floor/plating, /area/maintenance/substation/civilian_west) +"rv" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + dir = 8; + frequency = 1441; + id_tag = "n2o_out" + }, +/turf/simulated/floor/reinforced/n20, +/area/engineering/atmos/air) +"rw" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "6,6" + }, +/area/template_noop) "rx" = ( /obj/effect/floor_decal/corner_wide/purple, /obj/effect/floor_decal/corner_wide/purple{ @@ -5438,12 +5785,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-4"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-4" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "rB" = ( /obj/structure/cable/green{ @@ -5457,6 +5802,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) +"rC" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "9,1"; + opacity = 0 + }, +/area/template_noop) "rD" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/plating, @@ -5485,15 +5837,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "rH" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph2"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph2" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "rI" = ( /obj/structure/cable/green{ @@ -5534,12 +5884,13 @@ /turf/space/dynamic, /area/template_noop) "rO" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/nitrous_oxide{ + density = 0; icon_state = "h5"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "rP" = ( /obj/effect/floor_decal/industrial/warning{ @@ -5557,13 +5908,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/loading) "rR" = ( -/obj/machinery/air_sensor, /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ +/obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 8 }, -/turf/simulated/floor/reinforced, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "air_sensor" + }, +/obj/effect/decal/fake_object/light_source/invisible, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "rS" = ( /obj/machinery/atmospherics/binary/passive_gate{ @@ -5673,6 +6028,15 @@ icon_state = "2,17" }, /area/shuttle/escape_pod) +"so" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/machinery/atmospherics/binary/pump{ + name = "Carbon dioxide to Mix" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "sp" = ( /obj/machinery/light, /turf/simulated/floor/tiled/dark, @@ -5729,16 +6093,14 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "sA" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph3"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/phoron{ + icon_state = "ph3" + }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "sC" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -5762,6 +6124,12 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) +"sE" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "8,6" + }, +/area/template_noop) "sF" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled, @@ -5773,6 +6141,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) +"sJ" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + id = "ph_in"; + name = "phoron injector"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/phoron, +/area/engineering/atmos) "sL" = ( /obj/machinery/door/blast/shutters/open{ dir = 2 @@ -5812,6 +6189,7 @@ /area/shuttle/escape_pod) "sQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/meter, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "sR" = ( @@ -5832,15 +6210,16 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "sT" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-11"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 }, -/turf/simulated/floor/reinforced, +/obj/structure/tank_wall/oxygen{ + density = 0; + icon_state = "o2-11"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "sU" = ( /obj/structure/window/shuttle/unique/burglar{ @@ -5861,12 +6240,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) +"sX" = ( +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "sY" = ( /obj/structure/shuttle_part/mercenary/small{ icon_state = "8,4" }, /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) +"sZ" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,5" + }, +/area/template_noop) "ta" = ( /obj/machinery/conveyor{ dir = 1; @@ -5883,6 +6271,12 @@ }, /turf/simulated/floor/tiled, /area/hangar/cargo) +"tb" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "10,6" + }, +/area/template_noop) "tc" = ( /obj/machinery/conveyor{ dir = 8; @@ -5897,6 +6291,9 @@ icon_state = "13,8" }, /area/shuttle/escape_pod) +"te" = ( +/turf/simulated/floor/reinforced/phoron, +/area/engineering/atmos) "tf" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -5954,18 +6351,32 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape_pod) +"tn" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "5,12" + }, +/area/template_noop) "tp" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/tiled/dark, /area/shuttle/escape_pod) "tq" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/nitrous_oxide{ + density = 0; icon_state = "h12"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) +"tr" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "3,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "ts" = ( /turf/simulated/floor/shuttle/dark_blue, /area/shuttle) @@ -5996,6 +6407,13 @@ }, /turf/simulated/floor/tiled, /area/maintenance/vault) +"tx" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "0,7" + }, +/turf/simulated/floor/plating, +/area/template_noop) "ty" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 4 @@ -6098,16 +6516,20 @@ dir = 8 }, /area/maintenance/vault) +"tS" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "10,5" + }, +/area/template_noop) "tT" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h10" + }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h10"; - name = "tank" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "tU" = ( /obj/structure/window/shuttle/unique/raider{ @@ -6222,12 +6644,13 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "um" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/carbon_dioxide{ + density = 0; icon_state = "co2-6"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "un" = ( /obj/structure/window/shuttle/unique/raider{ @@ -6255,6 +6678,12 @@ /obj/machinery/door/airlock/research, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod) +"us" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "5,5" + }, +/area/template_noop) "ut" = ( /obj/structure/cable{ icon_state = "1-8" @@ -6271,6 +6700,15 @@ /obj/machinery/space_heater, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) +"uv" = ( +/obj/structure/tank_wall{ + icon_state = "m-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) "uw" = ( /obj/effect/decal/cleanable/draftingchalk/blue, /turf/simulated/wall/shuttle/unique/merchant{ @@ -6279,14 +6717,12 @@ }, /area/shuttle/escape_pod) "ux" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n10"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n10" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "uy" = ( @@ -6329,6 +6765,13 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"uF" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,7" + }, +/turf/simulated/floor/plating, +/area/template_noop) "uG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -6461,6 +6904,12 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"uW" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "5,6" + }, +/area/template_noop) "uX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6517,14 +6966,19 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "vh" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n8"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n8" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) +"vi" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 1 + }, +/obj/machinery/meter, /turf/simulated/floor/plating, /area/engineering/atmos/air) "vj" = ( @@ -6598,24 +7052,27 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "vv" = ( -/obj/machinery/door/airlock/hatch, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "vx" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-12"; - name = "tank" +/obj/structure/tank_wall{ + density = 0; + icon_state = "m-12"; + layer = 10.1; + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos) "vz" = ( /obj/structure/table/standard, @@ -6625,9 +7082,22 @@ /obj/item/ladder_mobile, /turf/simulated/floor/plating, /area/engineering/storage/lower) +"vA" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,9" + }, +/area/template_noop) "vB" = ( /turf/simulated/wall/placeholder_standard, /area/engineering/atmos/air) +"vD" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Air to Connector" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "vE" = ( /turf/simulated/wall/placeholder_standard, /area/maintenance/substation/research_sublevel) @@ -6683,23 +7153,19 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-7"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-7" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "vP" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h13" + }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h13"; - name = "tank" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "vQ" = ( /obj/structure/window/shuttle/unique/mercenary/small{ @@ -6709,12 +7175,13 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) "vR" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/phoron{ + density = 0; icon_state = "ph5"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "vT" = ( /obj/structure/table/standard, @@ -6908,6 +7375,22 @@ opacity = 0 }, /area/shuttle/escape_pod) +"wE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/machinery/atmospherics/binary/pump{ + name = "Phoron to Mix" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) +"wF" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "15,9" + }, +/turf/simulated/floor/plating, +/area/template_noop) "wG" = ( /obj/effect/shuttle_landmark/lift/cargo_bottom, /turf/simulated/floor/plating, @@ -6982,17 +7465,15 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "wT" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-10"; - name = "tank" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-10" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "wU" = ( @@ -7007,6 +7488,15 @@ }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) +"wV" = ( +/turf/simulated/floor/reinforced/n20, +/area/engineering/atmos/air) +"wW" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "wX" = ( /obj/structure/shuttle_part/burglar{ icon_state = "5,4"; @@ -7093,16 +7583,21 @@ /turf/simulated/wall/r_wall, /area/maintenance/vault) "xk" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-8"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-8" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"xl" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,8" + }, +/turf/simulated/floor/plating, +/area/template_noop) "xm" = ( /obj/structure/shuttle_part/burglar{ icon_state = "11,1" @@ -7147,6 +7642,13 @@ /obj/machinery/door/airlock/research, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) +"xu" = ( +/obj/effect/decal/cleanable/draftingchalk/blue, +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "12,9" + }, +/area/template_noop) "xv" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, @@ -7164,22 +7666,22 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-13"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-13" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "xA" = ( /obj/machinery/atmospherics/omni/mixer{ active_power_usage = 7500; + name = "air mixer"; tag_east = 2; tag_south = 1; tag_south_con = 0.79; tag_west = 1; tag_west_con = 0.21 }, +/obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/plating, /area/engineering/atmos/air) "xB" = ( @@ -7216,6 +7718,17 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/hangar/auxiliary) +"xI" = ( +/obj/machinery/atmospherics/unary/engine/placeholder, +/obj/structure/tank_wall/hydrogen{ + icon_state = "h11" + }, +/turf/simulated/floor/reinforced{ + blocks_air = 1; + density = 1; + name = "thruster mount" + }, +/area/engineering/atmos/air) "xJ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7243,6 +7756,13 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) +"xL" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,6" + }, +/turf/simulated/floor/plating, +/area/template_noop) "xM" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7262,12 +7782,10 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "xO" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h16"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "h16" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "xP" = ( @@ -7348,12 +7866,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "ya" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/nitrogen{ + density = 0; icon_state = "n5"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "yb" = ( /obj/effect/floor_decal/industrial/warning, @@ -7405,14 +7924,19 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "yg" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n9"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n9" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) +"yh" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Excess Waste to Mix" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "yi" = ( @@ -7522,6 +8046,15 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/maintenance/vault) "yC" = ( @@ -7535,9 +8068,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"yE" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "12,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) +"yF" = ( +/obj/structure/tank_wall{ + icon_state = "m-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) "yH" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -7638,13 +8189,17 @@ }, /area/shuttle/escape_pod) "yY" = ( -/obj/machinery/air_sensor, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/atmospherics/pipe/manifold/hidden/green{ +/obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 8 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "n_sensor" + }, +/obj/effect/decal/fake_object/light_source/invisible, +/turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "yZ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -7658,6 +8213,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) +"za" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,8" + }, +/turf/simulated/floor/plating, +/area/template_noop) "zb" = ( /obj/structure/window/shuttle/unique/raider{ icon = 'icons/turf/shuttles_unique/HTS_Canary.dmi'; @@ -7681,25 +8243,21 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "zd" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph7"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph7" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "ze" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h16"; - name = "tank" +/obj/structure/tank_wall/hydrogen{ + icon_state = "h16" }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/airless, /area/engineering/atmos) "zf" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -7871,13 +8429,16 @@ dir = 8 }, /area/hangar/cargo) +"zC" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "zD" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-16"; - name = "tank" +/obj/structure/tank_wall{ + icon_state = "m-16" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/engineering/atmos) "zE" = ( @@ -7942,8 +8503,19 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/maintenance/vault) +"zT" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "3,3" + }, +/area/template_noop) "zU" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light{ @@ -7951,6 +8523,22 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +"zV" = ( +/obj/structure/tank_wall{ + icon_state = "m-9" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) +"zW" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "zX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7973,6 +8561,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) +"zY" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "zZ" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, @@ -8014,11 +8609,18 @@ }, /turf/simulated/floor/plating, /area/hangar/intrepid) +"Ag" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "3,1" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Ah" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/green{ +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 5 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "Ai" = ( /obj/effect/floor_decal/industrial/warning{ @@ -8049,6 +8651,13 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) +"Am" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,4" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Ao" = ( /obj/machinery/door/blast/shutters/open{ dir = 2; @@ -8058,15 +8667,30 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/escape_pod) "Ap" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph16"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/phoron{ + icon_state = "ph16" + }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) +"Aq" = ( +/obj/machinery/power/apc/super/critical{ + pixel_y = -24 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/air) +"Ar" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,4" + }, +/turf/simulated/floor/plating, +/area/template_noop) "As" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -8163,12 +8787,10 @@ }, /area/shuttle/escape_pod) "AP" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-14"; - name = "tank" +/obj/structure/tank_wall{ + icon_state = "m-14" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/engineering/atmos) "AR" = ( @@ -8183,18 +8805,27 @@ icon_state = "4,18" }, /area/shuttle/escape_pod) +"AT" = ( +/obj/machinery/atmospherics/omni/filter{ + tag_east = 2; + tag_north = 7; + tag_west = 1 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "AU" = ( /obj/structure/window/shuttle/unique/mercenary/small{ icon_state = "2,11" }, /turf/simulated/floor/plating, /area/shuttle/escape_pod) -"AX" = ( -/obj/machinery/light/small{ - dir = 1 +"AY" = ( +/obj/structure/window/shuttle/unique/raider{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "9,3" }, /turf/simulated/floor/plating, -/area/engineering/atmos/air) +/area/template_noop) "Ba" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -8273,6 +8904,14 @@ /obj/machinery/door/window/westleft, /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) +"Bn" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "11,3"; + opacity = 1 + }, +/turf/simulated/floor/plating, +/area/template_noop) "Bo" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -8284,13 +8923,11 @@ /area/maintenance/vault) "Bp" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-14"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-14" }, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "Br" = ( /obj/structure/cable/green{ @@ -8353,33 +8990,30 @@ /area/engineering/atmos/air) "BB" = ( /obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + id = "h_in"; + name = "hydrogen injector"; use_power = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "BD" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air1"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/air, /turf/simulated/floor/plating, /area/engineering/atmos/air) "BE" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air4"; - name = "tank" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/tank_wall/air{ + icon_state = "air4" }, /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "BF" = ( @@ -8401,13 +9035,15 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hallway/primary/aft) +"BI" = ( +/obj/machinery/door/airlock/command, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "BJ" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n15"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n15" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "BM" = ( @@ -8465,6 +9101,11 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"BX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/meter, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "BY" = ( /obj/structure/table/steel, /obj/machinery/light{ @@ -8530,6 +9171,16 @@ }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) +"Cm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 4 + }, +/area/maintenance/vault) "Cn" = ( /obj/structure/window/shuttle/unique/raider{ icon = 'icons/turf/shuttles_unique/HTS_Canary.dmi'; @@ -8554,6 +9205,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) +"Cq" = ( +/obj/structure/tank_wall{ + density = 0; + icon_state = "m-5"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "Cr" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -8621,12 +9281,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "CF" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h15"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "n2o15" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "CG" = ( @@ -8690,19 +9348,19 @@ /area/hangar/intrepid) "CR" = ( /obj/machinery/computer/general_air_control/large_tank_control/wall{ - pixel_y = -3 + input_tag = "o2_in"; + name = "Oxygen Supply Monitor"; + output_tag = "o2_out"; + pixel_y = -3; + sensors = list("o2_sensor" = "Tank") }, -/turf/simulated/wall/placeholder_standard, +/turf/simulated/wall/r_wall, /area/engineering/atmos/air) "CS" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h1"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/nitrous_oxide, /turf/simulated/floor/plating, /area/engineering/atmos/air) "CT" = ( @@ -8717,13 +9375,14 @@ /turf/simulated/floor/tiled/dark, /area/hangar/briefing) "CW" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/carbon_dioxide{ + density = 0; icon_state = "co2-11"; - name = "tank" + layer = 10.1; + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "CX" = ( /turf/simulated/wall/shuttle/unique/mercenary/small{ @@ -8744,6 +9403,13 @@ /obj/machinery/door/window/northleft, /turf/simulated/floor/tiled/dark, /area/rnd/eva) +"CZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/tank/oxygen, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/air) "Da" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -8754,12 +9420,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "Db" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-14"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-14" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Dc" = ( @@ -8780,6 +9444,12 @@ icon_state = "13,6" }, /area/shuttle/escape_pod) +"Dg" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "9,6" + }, +/area/template_noop) "Dh" = ( /obj/machinery/vending/vendors, /turf/simulated/floor/tiled, @@ -8834,11 +9504,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/loading) "Dq" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-1"; - name = "tank" - }, +/obj/structure/tank_wall, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -8858,6 +9524,13 @@ opacity = 0 }, /area/shuttle/escape_pod) +"Du" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Mix to Connector" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "Dv" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4 @@ -9217,6 +9890,13 @@ icon_state = "6,10" }, /area/shuttle/escape_pod) +"Eu" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Phoron to Connector" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "Ew" = ( /obj/effect/floor_decal/corner_wide/purple/full{ dir = 4 @@ -9327,11 +10007,14 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "EK" = ( -/obj/machinery/air_sensor, /obj/effect/floor_decal/corner/purple/diagonal, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "ph_sensor" + }, /obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "EL" = ( /obj/structure/cable/green{ @@ -9357,6 +10040,13 @@ }, /turf/simulated/floor/tiled, /area/hangar/cargo) +"EN" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Mix to Waste" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "EO" = ( /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) @@ -9366,16 +10056,14 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "EQ" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h3" + }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h3"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "ER" = ( /obj/structure/cable/green{ @@ -9405,26 +10093,20 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "EV" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph1"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/phoron, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "EW" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n4"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n4" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "EX" = ( @@ -9434,6 +10116,13 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape_pod) +"EY" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Carbon dioxide to Connector" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "EZ" = ( /obj/structure/window/shuttle/placeholder, /obj/structure/grille, @@ -9455,17 +10144,29 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-9"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-9" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "Fd" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod) +"Fe" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "7,1"; + opacity = 0 + }, +/area/template_noop) +"Fg" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "12,1" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Fh" = ( /obj/machinery/conveyor{ dir = 8; @@ -9475,11 +10176,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/loading) "Fi" = ( -/obj/machinery/air_sensor, /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "h_sensor" + }, /obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "Fj" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -9516,21 +10220,23 @@ /turf/simulated/floor/reinforced, /area/hangar/control) "Fp" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph9"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph9" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "Fq" = ( /obj/machinery/atmospherics/unary/outlet_injector{ - dir = 4 + dir = 4; + frequency = 1441; + id = "mixed_in"; + name = "mixed gas injector"; + use_power = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos) "Fr" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, @@ -9555,7 +10261,8 @@ /area/shuttle/escape_pod) "Fv" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 8 + dir = 8; + name = "Hydrogen to Connector" }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) @@ -9583,6 +10290,11 @@ /obj/machinery/door/airlock/external, /turf/simulated/floor/tiled, /area/hangar/cargo) +"FB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "FC" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -9699,12 +10411,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-10"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-10" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "FS" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -9730,6 +10440,13 @@ }, /turf/simulated/wall/placeholder_standard, /area/maintenance/vault) +"FX" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "4,1" + }, +/turf/simulated/floor/plating, +/area/template_noop) "FY" = ( /obj/machinery/conveyor{ dir = 8; @@ -9737,6 +10454,14 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/loading) +"Ga" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ + dir = 8; + frequency = 1441; + id_tag = "n_out" + }, +/turf/simulated/floor/reinforced/nitrogen, +/area/engineering/atmos/air) "Gc" = ( /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/dark, @@ -9748,14 +10473,12 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "Ge" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air9"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/air{ + icon_state = "air9" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Gf" = ( @@ -9779,6 +10502,13 @@ /obj/item/storage/bag/trash, /turf/simulated/floor/tiled, /area/janitor) +"Gl" = ( +/obj/structure/window/shuttle/unique/raider{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "6,3" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Gm" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 @@ -9835,8 +10565,24 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/vault) +"Gv" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "0,8" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Gw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9956,6 +10702,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) +"GQ" = ( +/obj/structure/tank_wall{ + icon_state = "m-15" + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/engineering/atmos) "GR" = ( /obj/machinery/light{ dir = 1 @@ -9983,6 +10736,11 @@ /obj/machinery/recharge_station, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) +"GU" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/obj/machinery/air_sensor, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos/air) "GV" = ( /turf/simulated/wall/shuttle/unique/mercenary/small{ icon_state = "3,9" @@ -10010,6 +10768,13 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape_pod) +"Ha" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,5" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Hb" = ( /obj/structure/shuttle_part/placeholder{ icon = 'icons/turf/shuttles_unique/HTS_Canary.dmi'; @@ -10096,6 +10861,12 @@ /obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/tiled, /area/hangar/control) +"Ho" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,4" + }, +/area/template_noop) "Hp" = ( /turf/simulated/wall/shuttle/placeholder/cardinal, /area/hangar/auxiliary) @@ -10155,6 +10926,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "HA" = ( @@ -10303,15 +11077,13 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod) "HT" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h2" + }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h2"; - name = "tank" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "HU" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -10370,6 +11142,23 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"Id" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/vault) "Ig" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -10431,14 +11220,12 @@ /turf/simulated/floor/plating, /area/maintenance/substation/supply) "Iq" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air7"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/air{ + icon_state = "air7" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Is" = ( @@ -10478,14 +11265,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "Iz" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-9"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-9" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "IA" = ( @@ -10584,14 +11369,22 @@ }, /turf/simulated/floor/tiled, /area/medical/emergency_storage) +"IM" = ( +/obj/structure/lattice/catwalk/indoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/hatch, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "IN" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-15"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-15" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "IO" = ( /obj/structure/computerframe, @@ -10631,6 +11424,13 @@ }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) +"IS" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "11,1" + }, +/turf/simulated/floor/plating, +/area/template_noop) "IT" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -10638,7 +11438,12 @@ /turf/simulated/floor/reinforced, /area/hangar/control) "IV" = ( -/obj/machinery/computer/general_air_control/large_tank_control, +/obj/machinery/computer/general_air_control/large_tank_control{ + input_tag = "h_in"; + name = "Hydrogen Supply Monitor"; + output_tag = "h_out"; + sensors = list("h_sensor" = "Tank") + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "IW" = ( @@ -10713,17 +11518,15 @@ /turf/simulated/floor/reinforced, /area/rnd/isolation_b) "Jm" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n13"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n13" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Jn" = ( @@ -10771,12 +11574,13 @@ }, /area/crew_quarters/kitchen/freezer) "Ju" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/phoron{ + density = 0; icon_state = "ph6"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "Jv" = ( /obj/structure/ladder/up{ @@ -10869,6 +11673,12 @@ }, /turf/simulated/floor/tiled, /area/hangar/intrepid) +"JL" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "12,3" + }, +/area/template_noop) "JM" = ( /obj/structure/window/shuttle/legion, /obj/structure/grille, @@ -10912,7 +11722,8 @@ /area/shuttle/escape_pod) "JS" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 8 + dir = 8; + name = "Oxygen to Mix" }, /turf/simulated/floor/plating, /area/engineering/atmos/air) @@ -10923,6 +11734,13 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/test_range) +"JU" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,6" + }, +/turf/simulated/floor/plating, +/area/template_noop) "JV" = ( /obj/machinery/power/apc/super/critical{ dir = 8; @@ -10943,15 +11761,13 @@ }, /area/shuttle/escape_pod) "JY" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h7" + }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h7"; - name = "tank" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "JZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11045,6 +11861,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"Kl" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "Km" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11061,15 +11883,16 @@ /turf/simulated/floor/plating, /area/medical/emergency_storage) "Ko" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air11"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 }, -/turf/simulated/floor/reinforced, +/obj/structure/tank_wall/air{ + density = 0; + icon_state = "air11"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "Kp" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -11160,17 +11983,15 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "KC" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air10"; - name = "tank" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/tank_wall/air{ + icon_state = "air10" }, /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "KD" = ( @@ -11191,12 +12012,13 @@ /turf/simulated/wall/r_wall, /area/hangar/auxiliary) "KG" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/oxygen{ + density = 0; icon_state = "o2-6"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "KH" = ( /obj/structure/shuttle_part/mercenary/small{ @@ -11243,10 +12065,19 @@ icon_state = "1,6" }, /area/shuttle/escape_pod) +"KN" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,9" + }, +/area/template_noop) "KO" = ( /obj/machinery/door/airlock/mining, /turf/simulated/floor/tiled, /area/hangar/intrepid) +"KP" = ( +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/engineering/atmos) "KQ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -11335,12 +12166,13 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "KY" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/air{ + density = 0; icon_state = "air6"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "KZ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -11363,6 +12195,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) +"Lb" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Lc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -11393,15 +12232,13 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "Lh" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n2"; - name = "tank" - }, -/obj/machinery/atmospherics/pipe/simple/visible/green, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n2" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Li" = ( @@ -11618,6 +12455,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) +"LN" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/air) "LO" = ( /obj/machinery/door/blast/shutters/open{ dir = 2 @@ -11631,6 +12472,13 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"LP" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,2" + }, +/turf/simulated/floor/plating, +/area/template_noop) "LQ" = ( /obj/structure/table/steel, /turf/simulated/floor/shuttle/black, @@ -11703,14 +12551,10 @@ /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) "Me" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n1"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/nitrogen, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Mf" = ( @@ -11721,19 +12565,23 @@ dir = 4 }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "Mi" = ( /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "Mk" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h11"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/reinforced, +/obj/structure/tank_wall/hydrogen{ + density = 0; + icon_state = "h11"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/hydrogen, /area/engineering/atmos) "Ml" = ( /obj/structure/closet/jcloset, @@ -11773,14 +12621,12 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "Mq" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h4"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "h4" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Mr" = ( @@ -11788,14 +12634,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "Ms" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air3"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/air{ + icon_state = "air3" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Mt" = ( @@ -11816,13 +12660,20 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/hangar/control) -"Mx" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-11"; - name = "tank" +"Mw" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) +"Mx" = ( +/obj/structure/tank_wall{ + density = 0; + icon_state = "m-11"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/airless, /area/engineering/atmos) "My" = ( /obj/structure/bed/chair/office/dark, @@ -11851,13 +12702,11 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "MB" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph15"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/obj/structure/tank_wall/phoron{ + icon_state = "ph15" + }, +/turf/simulated/floor/airless, /area/engineering/atmos) "MC" = ( /obj/effect/floor_decal/industrial/warning{ @@ -12019,6 +12868,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) +"MZ" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "10,2"; + opacity = 0 + }, +/area/template_noop) "Na" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -12150,14 +13006,24 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "Nu" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n16"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n16" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"Nv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos/air) +"Nw" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,6" + }, +/area/template_noop) "Nx" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -12206,6 +13072,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/hangar) +"ND" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "NE" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled/ramp{ @@ -12252,14 +13122,10 @@ /turf/simulated/floor/reinforced, /area/rnd/isolation_c) "NP" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-1"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/oxygen, /turf/simulated/floor/plating, /area/engineering/atmos/air) "NQ" = ( @@ -12301,6 +13167,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"NU" = ( +/obj/machinery/computer/shuttle_control, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "NV" = ( /turf/simulated/floor/plating, /area/turbolift/research/deck_1) @@ -12328,6 +13198,13 @@ }, /turf/simulated/floor/plating, /area/turret_protected/ai) +"NZ" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Air to Mix" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "Oa" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -12354,14 +13231,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "Oe" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h13"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "h13" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Of" = ( @@ -12420,6 +13295,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian_west) +"Oq" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "Or" = ( /obj/machinery/mineral/rigpress, /turf/simulated/floor/tiled, @@ -12498,12 +13379,13 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "OE" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/nitrogen{ + density = 0; icon_state = "n6"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "OF" = ( /obj/structure/closet/jcloset, @@ -12531,6 +13413,19 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape_pod) +"OK" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "10,1" + }, +/turf/simulated/floor/plating, +/area/template_noop) +"ON" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,4" + }, +/area/template_noop) "OO" = ( /obj/machinery/light{ dir = 4 @@ -12545,13 +13440,14 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) "OQ" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/carbon_dioxide{ + density = 0; icon_state = "co2-12"; - name = "tank" + layer = 10.1; + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "OR" = ( /obj/effect/floor_decal/industrial/warning, @@ -12594,6 +13490,13 @@ icon_state = "1,9" }, /area/shuttle/escape_pod) +"OW" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Nitrogen to Mix" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "OY" = ( /obj/structure/shuttle_part/mercenary/small{ icon_state = "8,2" @@ -12712,14 +13615,12 @@ /turf/simulated/floor/tiled/ramp, /area/maintenance/vault) "Pt" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h14"; - name = "tank" +/obj/structure/tank_wall/hydrogen{ + icon_state = "h14" }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/airless, /area/engineering/atmos) "Pu" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -12742,26 +13643,22 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "Px" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-7"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-7" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Py" = ( +/obj/structure/tank_wall/hydrogen{ + icon_state = "h9" + }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h9"; - name = "tank" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "Pz" = ( /obj/structure/cable{ @@ -12851,14 +13748,12 @@ }, /area/maintenance/vault) "PO" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "ph14"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/phoron{ + icon_state = "ph14" + }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "PP" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -12926,13 +13821,11 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "PV" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "n14"; - name = "tank" - }, -/obj/machinery/atmospherics/pipe/simple/visible/green, /obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/structure/tank_wall/nitrogen{ + icon_state = "n14" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "PW" = ( @@ -12984,15 +13877,13 @@ }, /area/shuttle/escape_pod) "Qd" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h2"; - name = "tank" - }, -/obj/machinery/atmospherics/pipe/simple/visible/red, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "n2o2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Qe" = ( @@ -13131,14 +14022,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "Qx" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air2"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/tank_wall/air{ + icon_state = "air2" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Qz" = ( @@ -13176,6 +14065,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research_sublevel) +"QE" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "13,5" + }, +/area/template_noop) "QF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13229,6 +14124,13 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) +"QM" = ( +/obj/machinery/door/airlock/research, +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "5,12" + }, +/area/template_noop) "QO" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 2 @@ -13270,6 +14172,15 @@ "QU" = ( /turf/simulated/wall/r_wall, /area/rnd/xenoarch_atrium) +"QV" = ( +/obj/structure/tank_wall{ + icon_state = "m-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) "QW" = ( /obj/structure/largecrate/animal/cow, /obj/machinery/light{ @@ -13307,12 +14218,10 @@ }, /area/shuttle/escape_pod) "Rd" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-16"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-16" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Re" = ( @@ -13412,7 +14321,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "Rp" = ( -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipedispenser, /turf/simulated/floor/plating, /area/maintenance/vault) "Rr" = ( @@ -13426,11 +14335,22 @@ /area/hangar/auxiliary) "Rt" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - dir = 8 + dir = 8; + frequency = 1441; + id_tag = "air_out" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "Ru" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/ramp/bottom{ dir = 1 }, @@ -13456,12 +14376,10 @@ /turf/simulated/floor/reinforced, /area/rnd/isolation_c) "Rz" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air16"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/air{ + icon_state = "air16" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "RA" = ( @@ -13533,13 +14451,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "RK" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h14"; - name = "tank" +/obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "h14" }, /obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/engineering/atmos/air) "RL" = ( @@ -13574,6 +14490,12 @@ /obj/effect/floor_decal/corner_wide/purple/diagonal, /turf/simulated/floor/tiled/white, /area/rnd/test_range) +"RR" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,3" + }, +/area/template_noop) "RS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -13629,10 +14551,14 @@ /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) "RY" = ( -/obj/machinery/air_sensor, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/reinforced, +/obj/machinery/air_sensor{ + frequency = 1441; + id_tag = "o2_sensor" + }, +/obj/effect/decal/fake_object/light_source/invisible, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "RZ" = ( /obj/machinery/gibber, @@ -13645,6 +14571,12 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/eva) +"Sb" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "10,4" + }, +/area/template_noop) "Sc" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 @@ -13716,7 +14648,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "Sm" = ( /obj/machinery/door/airlock/external, @@ -13748,13 +14680,14 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian_west) "Sq" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/structure/tank_wall/nitrogen{ + density = 0; icon_state = "n11"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/green, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "Ss" = ( /obj/structure/shuttle_part/placeholder{ @@ -13773,12 +14706,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-8"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "Sv" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -13794,6 +14725,16 @@ "Sx" = ( /turf/simulated/wall/placeholder_standard, /area/hangar/auxiliary) +"SA" = ( +/obj/machinery/computer/general_air_control/large_tank_control/wall{ + input_tag = "n_in"; + name = "Nitrogen Supply Monitor"; + output_tag = "n_out"; + pixel_y = -3; + sensors = list("n_sensor" = "Tank") + }, +/turf/simulated/wall/r_wall, +/area/engineering/atmos/air) "SB" = ( /obj/machinery/power/apc{ dir = 1; @@ -13858,6 +14799,15 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"SI" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + id = "n2o_in"; + name = "nitrous oxide injector"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/n20, +/area/engineering/atmos/air) "SJ" = ( /obj/structure/shuttle/engine/heater{ dir = 1 @@ -13876,6 +14826,15 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/vault) "SL" = ( @@ -13907,8 +14866,24 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/maintenance/vault) +"SP" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "15,8" + }, +/turf/simulated/floor/plating, +/area/template_noop) "SR" = ( /obj/structure/shuttle_part/placeholder{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -13917,15 +14892,16 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "SS" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/air{ + density = 0; icon_state = "air5"; - name = "tank" + layer = 10.1; + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "SU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14058,14 +15034,12 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "Tn" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "h7"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/tank_wall/nitrous_oxide{ + icon_state = "h7" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "To" = ( @@ -14085,14 +15059,19 @@ }, /turf/simulated/floor/plating, /area/engineering/storage/lower) +"Tq" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi' + }, +/area/template_noop) "Tr" = ( /obj/machinery/atmospherics/omni/mixer{ active_power_usage = 7500; tag_east = 2; tag_north = 1; - tag_north_con = 0.79; + tag_north_con = 0.8; tag_west = 1; - tag_west_con = 0.21 + tag_west_con = 0.2 }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) @@ -14165,6 +15144,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/meter, /turf/simulated/floor/plating, /area/engineering/atmos) "TC" = ( @@ -14184,12 +15164,13 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "TF" = ( -/obj/machinery/atmospherics/pipe/tank/oxygen{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/machinery/meter, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "TG" = ( @@ -14207,17 +15188,21 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) +"TH" = ( +/turf/simulated/floor/plating, +/area/template_noop) "TJ" = ( /turf/simulated/wall/shuttle/legion, /area/shuttle/escape_pod) "TL" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/phoron{ + density = 0; icon_state = "ph11"; - name = "tank" + layer = 10.1; + opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "TO" = ( /obj/structure/shuttle_part/placeholder{ @@ -14250,6 +15235,15 @@ "TS" = ( /turf/simulated/floor/reinforced, /area/rnd/isolation_a) +"TT" = ( +/obj/machinery/computer/general_air_control/large_tank_control{ + input_tag = "co2_in"; + name = "Carbon Dioxide Supply Monitor"; + output_tag = "co2_out"; + sensors = list("co2_sensor" = "Tank") + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos) "TU" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -14275,14 +15269,12 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "TX" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-4"; - name = "tank" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/tank_wall/oxygen{ + icon_state = "o2-4" + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "TY" = ( @@ -14446,16 +15438,22 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/maintenance/vault) "UC" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "o2-12"; - name = "tank" - }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/turf/simulated/floor/reinforced, +/obj/structure/tank_wall/oxygen{ + density = 0; + icon_state = "o2-12"; + layer = 10.1; + opacity = 0 + }, +/turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) "UD" = ( /obj/structure/cable{ @@ -14542,8 +15540,8 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "UQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/green, -/turf/simulated/floor/reinforced, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "UR" = ( /obj/structure/table/rack, @@ -14782,6 +15780,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"Vy" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + id = "n_in"; + name = "nitrogen injector"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/nitrogen, +/area/engineering/atmos/air) "VB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -14821,13 +15828,11 @@ /area/hangar/control) "VI" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-16"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-16" }, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "VJ" = ( /turf/simulated/wall/shuttle/unique/mercenary/small{ @@ -14884,6 +15889,13 @@ }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) +"VR" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "0,9" + }, +/turf/simulated/floor/plating, +/area/template_noop) "VS" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -14963,11 +15975,14 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" }, /turf/simulated/floor/tiled/ramp/bottom{ dir = 1 @@ -14996,6 +16011,13 @@ }, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) +"Wm" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Nitrous Oxide to Mix" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "Wn" = ( /obj/structure/table/steel, /obj/machinery/light, @@ -15073,6 +16095,10 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/vault) +"WB" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos/air) "WC" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /obj/machinery/meter, @@ -15121,6 +16147,12 @@ /obj/machinery/computer/shuttle_control, /turf/simulated/floor/tiled/dark, /area/shuttle/escape_pod) +"WL" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,9" + }, +/area/template_noop) "WM" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/freezer{ @@ -15135,6 +16167,16 @@ icon_state = "1,13" }, /area/shuttle/escape_pod) +"WO" = ( +/obj/machinery/computer/general_air_control/large_tank_control/wall{ + input_tag = "n2o_in"; + name = "Nitrous Oxide Supply Monitor"; + output_tag = "n2o_out"; + pixel_y = -3; + sensors = list("n2o_sensor" = "Tank") + }, +/turf/simulated/wall/r_wall, +/area/engineering/atmos/air) "WP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15197,6 +16239,14 @@ }, /turf/simulated/floor/tiled, /area/hangar/cargo) +"WY" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + id = "air_in"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/airmix, +/area/engineering/atmos/air) "Xa" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/tiled, @@ -15256,6 +16306,13 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"Xm" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "14,3" + }, +/turf/simulated/floor/plating, +/area/template_noop) "Xn" = ( /obj/machinery/power/apc{ dir = 4; @@ -15272,12 +16329,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "Xp" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; +/obj/structure/tank_wall/air{ + density = 0; icon_state = "air12"; - name = "tank" + layer = 10.1; + opacity = 0 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "Xq" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -15336,7 +16394,8 @@ /area/maintenance/substation/engineering/lower) "XA" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 4 + dir = 4; + name = "Oxygen to Connector" }, /turf/simulated/floor/plating, /area/engineering/atmos/air) @@ -15409,13 +16468,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "XL" = ( -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "air15"; - name = "tank" +/obj/effect/floor_decal/industrial/warning, +/obj/structure/tank_wall/air{ + icon_state = "air15" }, /obj/machinery/atmospherics/pipe/simple/visible/blue, -/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/engineering/atmos/air) "XM" = ( @@ -15434,6 +16491,13 @@ /obj/machinery/suit_cycler/science, /turf/simulated/floor/tiled/dark, /area/rnd/eva) +"XP" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "5,3"; + opacity = 0 + }, +/area/template_noop) "XQ" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -15478,6 +16542,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/hangar/control) +"XW" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "2,7" + }, +/area/template_noop) "XX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -15516,6 +16586,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) +"Yb" = ( +/turf/simulated/wall/shuttle/unique/merchant{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "10,3"; + opacity = 0 + }, +/area/template_noop) "Yc" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -15540,7 +16617,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/atmospherics/binary/pump, +/obj/machinery/atmospherics/binary/pump{ + name = "Air to Distro"; + target_pressure = 200; + use_power = 1 + }, /turf/simulated/floor/plating, /area/engineering/atmos/air) "Yh" = ( @@ -15577,7 +16658,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating, /area/engineering/atmos/air) "Ym" = ( /obj/structure/bed/chair/shuttle{ @@ -15607,6 +16688,10 @@ }, /turf/simulated/floor/tiled, /area/medical/emergency_storage) +"Yr" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced_phoron, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "Ys" = ( /turf/simulated/wall/shuttle/unique/mercenary/small{ icon_state = "5,2" @@ -15660,6 +16745,13 @@ /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"YI" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Nitrous Oxide to Connector" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "YJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -15688,6 +16780,13 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) +"YM" = ( +/obj/structure/shuttle_part/placeholder{ + icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; + icon_state = "1,5" + }, +/turf/simulated/floor/plating, +/area/template_noop) "YO" = ( /obj/turbolift_map_holder/placeholder/primary, /turf/simulated/floor/plating, @@ -15886,16 +16985,21 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"Zs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/engineering/atmos/air) "Zv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/shuttle_part/placeholder{ - icon = 'icons/turf/placeholder_tanks.dmi'; - icon_state = "co2-2"; - name = "tank" +/obj/structure/tank_wall/carbon_dioxide{ + icon_state = "co2-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/engineering/atmos) "Zw" = ( /obj/structure/cable{ @@ -16027,6 +17131,9 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) +"ZK" = ( +/turf/simulated/floor/shuttle/dark_blue, +/area/template_noop) "ZL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -32757,7 +33864,7 @@ lr Na Kq aT -KK +CZ cn vB JQ @@ -32953,8 +34060,8 @@ aa aa Yh UN -BP -JH +xI +gs RJ FF Kq @@ -34177,11 +35284,11 @@ we RL rr dP -ox -rz -Su -FR -ox +Wg +uv +QV +nd +Wg fh Yu Ey @@ -34380,8 +35487,8 @@ RL ik Rn Dq -hv -bm +Cq +sX Mx AP MU @@ -34581,11 +35688,11 @@ XH RL NE Rn -Zv +yF dR qD Fq -IN +GQ MU Yu Yu @@ -34785,7 +35892,7 @@ dD Rn hK dS -bm +sX vx zD Rm @@ -34842,15 +35949,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +VR +Gv +tx +TH +TH +TH +TH +TH +TH aa aa aa @@ -34985,9 +36092,9 @@ di dB sg IA -ox +Wg dT -Fc +zV eB eJ eI @@ -35044,15 +36151,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +KN +za +oJ +JU +YM +Am +lu +zW +TH aa aa aa @@ -35176,11 +36283,11 @@ aa aa eb oi -ox +Wg fb fY tT -ox +Wg aa uU aa @@ -35246,15 +36353,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +WL +aG +XW +Nw +sZ +ON +RR +pi +TH aa aa aa @@ -35390,8 +36497,8 @@ lf ox ox ox -NI -NI +Du +EN YJ Ws pB @@ -35448,15 +36555,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ls +QM +ZK +ZK +ZK +Kl +zT +tr +Ag aa aa aa @@ -35650,15 +36757,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +qB +tn +ZK +ZK +ZK +ZK +rs +nk +FX aa aa aa @@ -35852,15 +36959,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +tn +tn +uW +rl +us +Tq +XP +lk +oE aa aa aa @@ -35984,18 +37091,18 @@ aa aa eb oi -ox +Wg JY Py vP -ox +Wg or uU aa Nc IV Fv -pB +jy dY yD eE @@ -36054,15 +37161,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Mw +Mw +rw +ZK +cJ +ND +Gl +lK +hf aa aa aa @@ -36201,7 +37308,7 @@ dw ec Mh Go -Fv +hB Ws ep LF @@ -36256,15 +37363,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ZK +ZK +BI +ZK +ZK +ac +NU +ol +Fe aa aa aa @@ -36388,11 +37495,11 @@ aa aa eb oi -ox +Wg ea pk in -ox +Wg aa uU aa @@ -36458,15 +37565,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ZK +ZK +sE +ZK +ZK +ac +NU +jm +gl aa aa aa @@ -36592,7 +37699,7 @@ oU gi EV vR -BB +sJ TL PO UF @@ -36660,15 +37767,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +wW +wW +Dg +ZK +ND +ND +AY +pd +rC aa aa aa @@ -36793,17 +37900,17 @@ aa eb aa rH -bm +te EK -bm +te MB aa uU aa Nc -IV -Fv -pB +ch +Eu +jy dV bl Wt @@ -36862,15 +37969,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +tn +tn +tb +rl +tS +Sb +Yb +MZ +OK aa aa aa @@ -36996,7 +38103,7 @@ oU gi sA Ju -gu +eu jX Ap bv @@ -37005,7 +38112,7 @@ UF cP sQ Bu -dw +wE SG ed eG @@ -37064,15 +38171,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +fE +tn +ZK +ZK +ZK +ZK +Bn +nX +IS aa aa aa @@ -37196,11 +38303,11 @@ aa aa eb oi -ox +Wg zd Fp eo -ox +Wg Jv uU aa @@ -37266,15 +38373,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +xu +QM +ZK +ZK +ZK +Oq +JL +yE +Fg aa aa aa @@ -37407,9 +38514,9 @@ hy kk lY ga -pM +BX Qw -cF +ng dv LG ro @@ -37468,15 +38575,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +qh +qx +je +ee +QE +Ho +dg +Lb +TH aa aa aa @@ -37600,18 +38707,18 @@ aa aa eb oi -ox +Wg rz Su FR -ox +Wg pj uU aa Nc -IV -Fv -pB +TT +EY +jy dv LG ro @@ -37670,15 +38777,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +vA +xl +uF +xL +Ha +Ar +Xm +LP +TH aa aa aa @@ -37804,16 +38911,16 @@ jP gi gA hv -BB +km CW Bp JP uU hy ga -pM +BX qV -dw +so Pv PL PL @@ -37872,15 +38979,15 @@ qp Xc qp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +wF +SP +dE +TH +TH +TH +TH +TH +TH aa aa aa @@ -38005,9 +39112,9 @@ aa eb aa Zv -bm +KP ie -bm +KP IN aa uU @@ -38208,26 +39315,26 @@ jP gi gH um -gu +cr OQ VI Cw Au JP Kq -vB +Xw TX xk wT -vB +Xw ZG pp fz -vB +Xw EW vh ux -vB +Xw Yc vB uX @@ -38408,11 +39515,11 @@ aa aa eb oi -ox +Wg vO Fc xy -ox +Wg aa uU aa @@ -38424,10 +39531,10 @@ sT Db JS oO -JS +OW Me ya -od +Vy Sq PV gL @@ -38823,15 +39930,15 @@ Kq Kq jE KG -XE +dF UC Rd XA oO -XA +oq ew OE -Rt +Ga pa Nu Yc @@ -39021,9 +40128,9 @@ Kq Ej iU bB -vB -Uv -vB +Aq +Kq +Xw Px Iz ra @@ -39031,12 +40138,12 @@ CR zt oO zt -CR +SA fS yg Jm -vB -Yc +Xw +Zs vB uX RI @@ -39223,14 +40330,14 @@ Kq Cu yb PJ -vB -AX +BN +Kq Uv fc Bg BA zx -Bg +vi uV Bg zx @@ -39426,7 +40533,7 @@ nt vG kn vv -TV +IM TV NT TV @@ -39627,14 +40734,14 @@ Kq wo du cv -vB -Uv +BN +Kq Uv nU Uv xA Ck -Mm +zC bo Mm Ck @@ -39829,21 +40936,21 @@ Kq zj lr TF -vB -Uv -vB +dM +Kq +Xw BE id KC -CR +bU Xu oO Xu -CR +WO Mq rm hr -vB +Xw Yc vB uX @@ -40031,22 +41138,22 @@ Kq Yl BN Dv -vB -Uv +el +Kq BD SS -od +WY Ko lC -JS +vD oO -JS +YI CS rO -od +SI fx RK -gL +AT vB uX RI @@ -40233,8 +41340,8 @@ Kq hX bI Tr -vB -Uv +el +Kq Qx mx rR @@ -40246,7 +41353,7 @@ HE Qd hn cA -cb +wV CF jN vB @@ -40435,19 +41542,19 @@ Kq cO el sv -vB -Uv +el +Kq Ms KY Rt Xp Rz -XA +NZ oO -XA +Wm kU ml -Rt +rv tq xO Yc @@ -40636,22 +41743,22 @@ uK IK aY Qv -FC -vB -Uv -vB +ih +LN +Kq +Xw Iq Ge lD -vB +Xw Ny NK Ud -vB +Xw Tn qQ Oe -vB +Xw Yc vB uX @@ -40839,8 +41946,8 @@ Kq sz Ke sv -vB -Uv +el +Kq Uv Uv Do @@ -40848,12 +41955,12 @@ Uv Uv Uv Hz -Uv -Uv -Uv -Do -Uv -Uv +ib +yh +FB +zY +fD +fD Rw vB uX @@ -40861,8 +41968,8 @@ RI yB UB zR -PM -yB +Cm +Id fZ Ab sW @@ -41040,9 +42147,9 @@ kY Kq gB bK -sv -vB -vB +hY +el +Kq vB vB vB @@ -41240,11 +42347,11 @@ Kq Kq Gf Kq -Kq -bN +Yr +cR cR Kq -ih +hq ll nM nM @@ -41442,9 +42549,9 @@ SJ lr Na Kq -XE -Iw -wt +jD +WB +Nv Kq Rp lG @@ -41644,11 +42751,11 @@ JH RJ TC Kq -XE -OH +jD +GU cT Kq -fm +me fm pn pn @@ -41846,11 +42953,11 @@ SJ KK ak Kq -XE +jD bQ cW Kq -LK +fm LK LK FO diff --git a/maps/placeholder/placeholder-2_deck_2.dmm b/maps/placeholder/placeholder-2_deck_2.dmm index c34e0cb513d..d4d6ddd8fff 100644 --- a/maps/placeholder/placeholder-2_deck_2.dmm +++ b/maps/placeholder/placeholder-2_deck_2.dmm @@ -8413,7 +8413,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/bedsheet/medical, /obj/structure/bed/roller, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) @@ -17905,7 +17904,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/door/airlock/glass_medical, +/obj/machinery/door/airlock/medical, /turf/simulated/floor/tiled, /area/medical/first_responder) "uXq" = ( @@ -19175,7 +19174,6 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) "wyV" = ( -/obj/item/bedsheet/medical, /obj/structure/bed/roller, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) diff --git a/maps/placeholder/placeholder-3_deck_3.dmm b/maps/placeholder/placeholder-3_deck_3.dmm index 6fa0b62cae0..9e137fa5009 100644 --- a/maps/placeholder/placeholder-3_deck_3.dmm +++ b/maps/placeholder/placeholder-3_deck_3.dmm @@ -3637,7 +3637,7 @@ "qs" = ( /obj/effect/map_effect/airlock/e_to_w/long/square/wide, /turf/simulated/wall/shuttle/placeholder/cardinal, -/area/template_noop) +/area/crew_quarters/theatre) "qu" = ( /obj/structure/table/rack, /obj/item/towel, @@ -37193,7 +37193,7 @@ my my my zS -QL +IY at at at @@ -37395,7 +37395,7 @@ IY IY IY IY -QL +IY at at at