From ec816c5b356a0699966c5357ef31bb13f66e699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=BB=E7=83=8F?= <85062773+washikarasu@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:38:43 +0100 Subject: [PATCH] "Nitrogen Filling my Engines", AI Upload Floating Camera and Noded Engine PowerNet Sensors (#6527) --- maps/rift/engines/burn.dmm | 98 +++++++-------------------- maps/rift/engines/rust.dmm | 44 ++++-------- maps/rift/engines/sme.dmm | 2 + maps/rift/levels/rift-06-surface3.dmm | 2 +- 4 files changed, 42 insertions(+), 104 deletions(-) diff --git a/maps/rift/engines/burn.dmm b/maps/rift/engines/burn.dmm index 73151002ff0..6a6ee7285b0 100644 --- a/maps/rift/engines/burn.dmm +++ b/maps/rift/engines/burn.dmm @@ -90,9 +90,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "dT" = ( /obj/effect/floor_decal/industrial/warning{ @@ -111,9 +109,7 @@ /obj/structure/window/phoronreinforced{ dir = 4 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "eB" = ( /obj/structure/cable/yellow{ @@ -132,9 +128,7 @@ id_tag = "engine_out"; frequency = 1437 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "eU" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, @@ -152,9 +146,7 @@ dir = 1 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "gF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -173,9 +165,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "gL" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -201,9 +191,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 8 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "ho" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -263,9 +251,7 @@ dir = 4 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "lf" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, @@ -327,9 +313,7 @@ /obj/structure/window/phoronreinforced{ dir = 8 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "oe" = ( /turf/template_noop, @@ -354,9 +338,7 @@ dir = 4 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "pM" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -406,9 +388,7 @@ dir = 1 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "sH" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -517,9 +497,7 @@ /obj/structure/window/phoronreinforced{ dir = 1 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "xI" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, @@ -591,9 +569,7 @@ dir = 1; frequency = 1437 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "BU" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, @@ -608,9 +584,7 @@ id_tag = "engine_sensor"; output = 63 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Cy" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -656,6 +630,7 @@ name = "Powernet Sensor - Engine Output"; name_tag = "Engine Output" }, +/obj/structure/cable/yellow, /turf/simulated/floor, /area/engineering/engine_room) "Fi" = ( @@ -664,9 +639,7 @@ dir = 4 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Fw" = ( /turf/simulated/floor/tiled/techfloor/grid, @@ -684,9 +657,7 @@ /obj/structure/window/phoronreinforced{ dir = 4 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "FW" = ( /obj/structure/cable/yellow{ @@ -733,6 +704,7 @@ name = "Powernet Sensor - Engine Power"; name_tag = "Engine Power" }, +/obj/structure/cable/cyan, /turf/simulated/floor, /area/engineering/engine_room) "HU" = ( @@ -758,18 +730,14 @@ id = "engine_in"; volume_rate = 100 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Ji" = ( /obj/structure/window/phoronreinforced/full{ dir = 8 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "JK" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -788,9 +756,7 @@ dir = 4 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "JS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -888,18 +854,14 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "MK" = ( /obj/machinery/igniter{ id = "engine_igniter"; on = 0 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "MZ" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger, @@ -945,9 +907,7 @@ dir = 1 }, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Pz" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ @@ -1002,9 +962,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Tl" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, @@ -1031,9 +989,7 @@ "Vi" = ( /obj/structure/window/phoronreinforced/full, /obj/structure/grille, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Vl" = ( /obj/effect/floor_decal/industrial/warning/corner, @@ -1062,9 +1018,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "VX" = ( /obj/effect/floor_decal/industrial/warning{ diff --git a/maps/rift/engines/rust.dmm b/maps/rift/engines/rust.dmm index 27e4888d2bb..fb1b489a1bf 100644 --- a/maps/rift/engines/rust.dmm +++ b/maps/rift/engines/rust.dmm @@ -10,9 +10,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 8 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "aQ" = ( /obj/machinery/air_alarm{ @@ -74,9 +72,7 @@ id_tag = "engine_sensor"; output = 63 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "ea" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -125,6 +121,7 @@ name = "Powernet Sensor - Engine Power"; name_tag = "Engine Power" }, +/obj/structure/cable/cyan, /turf/simulated/floor, /area/engineering/engine_room) "gu" = ( @@ -250,7 +247,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/turf/simulated/floor/greengrid/nitrogen, +/turf/simulated/floor/greengrid/airless, /area/engineering/engine_room) "kN" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -372,9 +369,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "qc" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, @@ -451,9 +446,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "tR" = ( /obj/structure/cable/yellow{ @@ -580,9 +573,7 @@ pump_direction = 0; on = 1 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Al" = ( /obj/structure/cable/yellow{ @@ -592,6 +583,7 @@ name = "Powernet Sensor - Engine Output"; name_tag = "Engine Output" }, +/obj/structure/cable/yellow, /turf/simulated/floor, /area/engineering/engine_room) "Am" = ( @@ -630,9 +622,7 @@ id = "cooling_in"; use_power = 1 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Bg" = ( /obj/effect/floor_decal/industrial/warning, @@ -849,9 +839,7 @@ pump_direction = 0; on = 1 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "LL" = ( /turf/template_noop, @@ -936,9 +924,7 @@ id = "cooling_in"; use_power = 1 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "NN" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -1044,9 +1030,7 @@ /turf/simulated/floor, /area/template_noop) "Ta" = ( -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "Th" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, @@ -1078,9 +1062,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, +/turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "WC" = ( /obj/structure/cable/cyan{ diff --git a/maps/rift/engines/sme.dmm b/maps/rift/engines/sme.dmm index c5feb56cf39..612ca254a1b 100644 --- a/maps/rift/engines/sme.dmm +++ b/maps/rift/engines/sme.dmm @@ -246,6 +246,7 @@ name = "Powernet Sensor - Engine Power"; name_tag = "Engine Power" }, +/obj/structure/cable/cyan, /turf/simulated/floor, /area/engineering/engine_room) "lT" = ( @@ -267,6 +268,7 @@ name = "Powernet Sensor - Engine Output"; name_tag = "Engine Output" }, +/obj/structure/cable/yellow, /turf/simulated/floor, /area/engineering/engine_room) "mz" = ( diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 34058183c0a..193ba766280 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -6447,7 +6447,7 @@ dir = 1 }, /obj/machinery/camera/network/command{ - dir = 10 + dir = 1 }, /obj/effect/floor_decal/techfloor{ dir = 10