diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm index 2482652a6b5..c930f9033ea 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm @@ -119,6 +119,12 @@ }, /turf/open/misc/asteroid/airless, /area/solars/tarkon) +"aK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/hydroponics/soil, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "aM" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/cult, @@ -198,13 +204,10 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "aZ" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/passive_vent, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/port_tarkon/atmos) +/obj/effect/decal/cleanable/blood, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "ba" = ( /obj/structure/table/optable, /obj/effect/turf_decal/tile/blue/anticorner, @@ -909,7 +912,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/mining) "eQ" = ( -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ +/obj/machinery/computer/atmos_control/tarkon/incinerator{ dir = 1 }, /obj/machinery/airalarm/all_access{ @@ -1055,8 +1058,8 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 8 }, -/obj/item/circuitboard/machine/sleeper, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/gun/medbeam/afad, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/trauma) "fJ" = ( @@ -1089,7 +1092,8 @@ /area/ruin/space/has_grav/port_tarkon/afthall) "fR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -1182,10 +1186,10 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "gs" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_interior, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_tarkon{ pixel_x = 40; - pixel_y = 8 + pixel_y = 5 }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -1427,10 +1431,8 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "hQ" = ( @@ -1666,7 +1668,8 @@ /area/ruin/space/has_grav/port_tarkon/porthall) "jj" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2055,7 +2058,8 @@ /area/ruin/space/has_grav/port_tarkon/developement) "ld" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2273,7 +2277,7 @@ /obj/effect/turf_decal/tile/red/fourcorners{ color = "#DE3A3A" }, -/obj/machinery/computer/atmos_control/nitrogen_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrogen_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2624,8 +2628,8 @@ "om" = ( /obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/carbon_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/carbon_tank{ + pixel_x = 26 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2698,7 +2702,8 @@ /area/ruin/space/has_grav/port_tarkon/developement) "oI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2717,7 +2722,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark/fourcorners, -/obj/machinery/computer/atmos_control/carbon_tank{ +/obj/machinery/computer/atmos_control/tarkon/carbon_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2838,11 +2843,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/starboardhall) "pz" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, -/obj/machinery/door/firedoor/solid, -/turf/open/floor/iron, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/garden) "pA" = ( /obj/effect/turf_decal/vg_decals/atmos/mix, @@ -2915,7 +2917,8 @@ /area/ruin/space/has_grav/port_tarkon/secoff) "pU" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2994,7 +2997,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/computer/atmos_control/oxygen_tank{ +/obj/machinery/computer/atmos_control/tarkon/oxygen_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -3202,7 +3205,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/airalarm/directional/south, +/obj/machinery/airalarm/all_access{ + pixel_y = -20 + }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/cult, /area/ruin/space/has_grav/port_tarkon/storage) @@ -3256,8 +3261,8 @@ "rL" = ( /obj/effect/turf_decal/vg_decals/atmos/oxygen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/oxygen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/oxygen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3301,9 +3306,11 @@ /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "sc" = ( -/obj/machinery/air_sensor/incinerator_tank, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/air_sensor/tarkon/incinerator_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "se" = ( @@ -3317,7 +3324,8 @@ /area/ruin/space/has_grav/port_tarkon/developement) "sj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3461,7 +3469,8 @@ /area/ruin/space/has_grav/port_tarkon/kitchen) "te" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3518,6 +3527,11 @@ }, /turf/open/misc/asteroid/airless, /area/ruin/space/has_grav) +"tv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron, +/area/ruin/space/has_grav/port_tarkon/starboardhall) "ty" = ( /obj/machinery/airalarm/all_access{ dir = 1; @@ -4056,6 +4070,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "wi" = ( @@ -4124,7 +4139,7 @@ /turf/open/misc/asteroid/airless, /area/solars/tarkon) "wW" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_tarkon{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, @@ -4167,7 +4182,8 @@ /area/ruin/space/has_grav/port_tarkon/trauma) "xj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4213,7 +4229,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "xB" = ( -/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/igniter/incinerator_tarkon, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 5 }, @@ -4425,7 +4441,9 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/port_tarkon/dorms) "yC" = ( -/obj/machinery/air_sensor/air_tank, +/obj/machinery/air_sensor/tarkon/mix_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "yD" = ( @@ -4448,6 +4466,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/cult, /area/ruin/space/has_grav/port_tarkon/developement) +"yJ" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/port_tarkon/atmos) "yL" = ( /obj/structure/statue/bone/rib, /obj/effect/decal/cleanable/blood, @@ -4647,7 +4674,8 @@ /area/ruin/space/has_grav/port_tarkon/trauma) "Ak" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4716,7 +4744,8 @@ /area/ruin/space/has_grav/port_tarkon/atmos) "AF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -5185,6 +5214,7 @@ /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/biogenerator, /turf/open/floor/cult, /area/ruin/space/has_grav/port_tarkon/garden) "Dk" = ( @@ -5546,14 +5576,8 @@ "Fl" = ( /obj/item/electronics/apc, /obj/item/electronics/apc, -/obj/item/electronics/apc, -/obj/item/electronics/apc, /obj/item/electronics/airlock, /obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airalarm, -/obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/structure/closet/crate/engineering/electrical{ @@ -5562,7 +5586,13 @@ /obj/item/electronics/tracker, /obj/item/stack/cable_coil, /obj/item/clothing/gloves/color/yellow, -/obj/effect/decal/cleanable/dirt/dust, +/obj/item/circuitboard/computer/atmos_control/tarkon/carbon_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/mix_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/nitrogen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/incinerator, +/obj/item/circuitboard/computer/atmos_control/tarkon/oxygen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/plasma_tank, +/obj/item/circuitboard/computer/tarkon_driver, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/forehall) "Fm" = ( @@ -5586,12 +5616,11 @@ /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "Fs" = ( -/obj/machinery/airlock_sensor/incinerator_atmos{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 +/obj/machinery/airlock_sensor/incinerator_tarkon{ + pixel_x = 6; + pixel_y = 23 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "Ft" = ( @@ -5812,8 +5841,8 @@ "GB" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/nitrous_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/nitrous_tank{ + pixel_x = 26 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -5933,6 +5962,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/port_tarkon/dorms) +"Hj" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/hydroponics/soil, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "Hk" = ( /obj/structure/cable, /obj/item/ammo_box/magazine/multi_sprite/g17, @@ -6711,7 +6746,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/storage) "KM" = ( -/obj/machinery/button/ignition/incinerator/atmos, +/obj/machinery/button/ignition/incinerator/tarkon, /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "KO" = ( @@ -6771,7 +6806,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/observ) "Ld" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_exterior, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6981,6 +7016,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/porthall) +"Ml" = ( +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/port_tarkon/atmos) "Mp" = ( /obj/machinery/airalarm/all_access{ dir = 8; @@ -7621,7 +7663,8 @@ /area/ruin/space/has_grav/port_tarkon/cargo) "Qk" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7657,7 +7700,7 @@ }, /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/cable, -/obj/machinery/computer/atmos_control/plasma_tank{ +/obj/machinery/computer/atmos_control/tarkon/plasma_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -7711,7 +7754,8 @@ /area/ruin/space/has_grav/port_tarkon) "QH" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7771,7 +7815,8 @@ /area/ruin/space/has_grav/port_tarkon) "Rf" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7935,8 +7980,8 @@ "RY" = ( /obj/effect/turf_decal/vg_decals/atmos/plasma, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/plasma_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/plasma_tank{ + pixel_x = 26 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -8173,6 +8218,7 @@ }, /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "Tk" = ( @@ -8455,9 +8501,7 @@ /area/ruin/space/has_grav/port_tarkon/developement) "UI" = ( /obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "UJ" = ( @@ -8679,8 +8723,8 @@ "Wd" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrogen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/nitrogen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/nitrogen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -8766,7 +8810,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/atmos_control/air_tank{ +/obj/machinery/computer/atmos_control/tarkon/mix_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -9162,7 +9206,6 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/toolstorage) "Zq" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -9196,7 +9239,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/computer/atmos_control/nitrous_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrous_tank{ dir = 8 }, /obj/effect/decal/cleanable/blood, @@ -10522,7 +10565,7 @@ il tj ez SM -aZ +Fh Zq hP QW @@ -10743,8 +10786,8 @@ SM SM jG lQ -lQ -xt +yJ +Ml xt WY zo @@ -10818,7 +10861,7 @@ Me hf hf xt -sv +xt zo zo sv @@ -12846,7 +12889,7 @@ AG cU MF gJ -XT +aZ Yk ev XG @@ -12921,8 +12964,8 @@ JR gJ Dj XT -XG -XG +aK +Hj XT Yv hj @@ -12994,9 +13037,9 @@ mT gJ gJ gJ -bA pz -gJ +pz +pz gJ hj hj @@ -13066,10 +13109,10 @@ LS MF YH LS -LS +tv Es LS -LS +tv Wi zp Ux diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm index 2c08a0afd04..6e5bed0075a 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm @@ -172,13 +172,11 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "aZ" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, +/obj/machinery/biogenerator, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/passive_vent, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/port_tarkon/atmos) +/obj/machinery/light/small/directional/east, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "ba" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/dirt, @@ -852,7 +850,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/mining) "eQ" = ( -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ +/obj/machinery/computer/atmos_control/tarkon/incinerator{ dir = 1 }, /obj/machinery/airalarm/all_access{ @@ -1000,7 +998,7 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 8 }, -/obj/item/circuitboard/machine/sleeper, +/obj/item/gun/medbeam/afad, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/trauma) "fJ" = ( @@ -1029,7 +1027,8 @@ /area/ruin/space/has_grav/port_tarkon/centerhall) "fR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -1131,10 +1130,10 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "gs" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_interior, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_tarkon{ pixel_x = 40; - pixel_y = 8 + pixel_y = 5 }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -1433,9 +1432,7 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "hQ" = ( @@ -1674,7 +1671,8 @@ /area/ruin/space/has_grav/port_tarkon/porthall) "jj" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2075,7 +2073,8 @@ /area/ruin/space/has_grav/port_tarkon/centerhall) "ld" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2207,6 +2206,7 @@ /obj/machinery/power/terminal{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) "lR" = ( @@ -2297,7 +2297,7 @@ /obj/effect/turf_decal/tile/red/fourcorners{ color = "#DE3A3A" }, -/obj/machinery/computer/atmos_control/nitrogen_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrogen_tank{ dir = 4 }, /turf/open/floor/iron, @@ -2613,8 +2613,8 @@ "om" = ( /obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/carbon_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/carbon_tank{ + pixel_x = 26 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2712,7 +2712,8 @@ /area/ruin/space/has_grav/port_tarkon/observ) "oI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2737,7 +2738,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark/fourcorners, -/obj/machinery/computer/atmos_control/carbon_tank{ +/obj/machinery/computer/atmos_control/tarkon/carbon_tank{ dir = 8 }, /turf/open/floor/iron, @@ -2878,11 +2879,9 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/starboardhall) "pz" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, /obj/machinery/door/firedoor/solid, -/turf/open/floor/iron, +/obj/effect/spawner/structure/window/reinforced/no_firelock, +/turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/garden) "pA" = ( /obj/effect/turf_decal/vg_decals/atmos/mix, @@ -2953,7 +2952,8 @@ /area/ruin/space/has_grav/port_tarkon/secoff) "pU" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2991,6 +2991,13 @@ }, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/centerhall) +"qd" = ( +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/port_tarkon/atmos) "qe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3022,7 +3029,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/computer/atmos_control/oxygen_tank{ +/obj/machinery/computer/atmos_control/tarkon/oxygen_tank{ dir = 4 }, /turf/open/floor/iron, @@ -3206,7 +3213,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/airalarm/directional/south, +/obj/machinery/airalarm/all_access{ + pixel_y = -20 + }, /obj/effect/turf_decal/tile/brown/half, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/storage) @@ -3272,8 +3281,8 @@ "rL" = ( /obj/effect/turf_decal/vg_decals/atmos/oxygen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/oxygen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/oxygen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3317,9 +3326,11 @@ /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "sc" = ( -/obj/machinery/air_sensor/incinerator_tank, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/air_sensor/tarkon/incinerator_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "sd" = ( @@ -3331,7 +3342,8 @@ /area/ruin/space/has_grav/port_tarkon/starboardhall) "sj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3463,7 +3475,8 @@ /area/ruin/space/has_grav/port_tarkon/kitchen) "te" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4044,6 +4057,7 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "wl" = ( @@ -4117,7 +4131,7 @@ /turf/open/misc/asteroid/airless, /area/solars/tarkon) "wW" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_tarkon{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, @@ -4158,7 +4172,8 @@ /area/ruin/space/has_grav/port_tarkon/trauma) "xj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4205,7 +4220,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "xB" = ( -/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/igniter/incinerator_tarkon, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 5 }, @@ -4404,7 +4419,9 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/centerhall) "yC" = ( -/obj/machinery/air_sensor/air_tank, +/obj/machinery/air_sensor/tarkon/mix_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "yD" = ( @@ -4577,7 +4594,8 @@ /area/ruin/space/has_grav/port_tarkon/comms) "Ak" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4645,7 +4663,8 @@ /area/ruin/space/has_grav/port_tarkon/starboardhall) "AF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -5420,17 +5439,10 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/secoff) "Fl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/electronics/apc, -/obj/item/electronics/apc, /obj/item/electronics/apc, /obj/item/electronics/apc, /obj/item/electronics/airlock, /obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airalarm, -/obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/structure/closet/crate/engineering/electrical{ @@ -5439,7 +5451,13 @@ /obj/item/electronics/tracker, /obj/item/stack/cable_coil, /obj/item/clothing/gloves/color/yellow, -/obj/effect/decal/cleanable/dirt, +/obj/item/circuitboard/computer/atmos_control/tarkon/carbon_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/mix_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/nitrogen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/incinerator, +/obj/item/circuitboard/computer/atmos_control/tarkon/oxygen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/plasma_tank, +/obj/item/circuitboard/computer/tarkon_driver, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/forehall) "Fm" = ( @@ -5463,12 +5481,11 @@ /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "Fs" = ( -/obj/machinery/airlock_sensor/incinerator_atmos{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 +/obj/machinery/airlock_sensor/incinerator_tarkon{ + pixel_x = 6; + pixel_y = 23 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "Ft" = ( @@ -5673,8 +5690,8 @@ "GB" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/nitrous_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/nitrous_tank{ + pixel_x = 26 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -6422,7 +6439,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/storage) "KM" = ( -/obj/machinery/button/ignition/incinerator/atmos, +/obj/machinery/button/ignition/incinerator/tarkon, /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "KO" = ( @@ -6487,7 +6504,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/observ) "Ld" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_exterior, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -7271,7 +7288,8 @@ /area/ruin/space/has_grav/port_tarkon/cargo) "Qk" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7306,7 +7324,7 @@ }, /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/cable, -/obj/machinery/computer/atmos_control/plasma_tank{ +/obj/machinery/computer/atmos_control/tarkon/plasma_tank{ dir = 8 }, /turf/open/floor/iron, @@ -7351,7 +7369,8 @@ /area/ruin/space/has_grav/port_tarkon/porthall) "QH" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7371,6 +7390,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/centerhall) +"QT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "QW" = ( /obj/structure/cable, /turf/open/floor/engine, @@ -7402,7 +7426,8 @@ /area/ruin/space/has_grav/port_tarkon/mining) "Rf" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7563,8 +7588,8 @@ "RY" = ( /obj/effect/turf_decal/vg_decals/atmos/plasma, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/plasma_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/plasma_tank{ + pixel_x = 26 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7798,6 +7823,7 @@ dir = 5 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "Tk" = ( @@ -8057,9 +8083,7 @@ /area/ruin/space/has_grav) "UI" = ( /obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "UJ" = ( @@ -8281,8 +8305,8 @@ "Wd" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrogen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/nitrogen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/nitrogen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -8374,7 +8398,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/atmos_control/air_tank{ +/obj/machinery/computer/atmos_control/tarkon/mix_tank{ dir = 4 }, /turf/open/floor/iron, @@ -8732,7 +8756,6 @@ /area/ruin/space/has_grav/port_tarkon/toolstorage) "Zq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) "Zr" = ( @@ -8755,7 +8778,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/computer/atmos_control/nitrous_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrous_tank{ dir = 8 }, /turf/open/floor/iron, @@ -10075,7 +10098,7 @@ SM vO ki ki -aZ +Fh Zq hP QW @@ -10297,7 +10320,7 @@ ki jG bS lQ -xt +qd xt WY zo @@ -10371,7 +10394,7 @@ Me hf hf xt -sv +xt zo zo sv @@ -12472,10 +12495,10 @@ Bg Cv vn gJ -rd +aZ Uv -yn -yn +QT +QT Uv rd hj @@ -12547,7 +12570,7 @@ mT gJ gJ gJ -bA +pz pz gJ gJ diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm index 9a06a864f66..715894fb6e2 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm @@ -154,13 +154,11 @@ /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav/port_tarkon/developement) "aZ" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/passive_vent, +/obj/machinery/biogenerator, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark/airless, -/area/ruin/space/has_grav/port_tarkon/atmos) +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "ba" = ( /obj/structure/table/optable, /obj/effect/turf_decal/tile/blue/anticorner, @@ -568,6 +566,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/crowbar, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/secoff) "dC" = ( @@ -734,7 +733,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/mining) "eQ" = ( -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ +/obj/machinery/computer/atmos_control/tarkon/incinerator{ dir = 1 }, /obj/machinery/airalarm/all_access{ @@ -791,6 +790,13 @@ /obj/effect/mob_spawn/corpse/facehugger, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) +"fk" = ( +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/has_grav/port_tarkon/atmos) "fl" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -871,8 +877,8 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 8 }, -/obj/item/circuitboard/machine/sleeper, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/gun/medbeam/afad, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/trauma) "fJ" = ( @@ -898,7 +904,8 @@ /area/ruin/space/has_grav/port_tarkon/afthall) "fR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -975,10 +982,10 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "gs" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_interior, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_tarkon{ pixel_x = 40; - pixel_y = 8 + pixel_y = 5 }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -1034,6 +1041,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/observ) +"gH" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/has_grav/port_tarkon/atmos) "gJ" = ( /obj/effect/spawner/structure/window/reinforced/no_firelock, /obj/machinery/door/firedoor/solid, @@ -1198,9 +1214,7 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -1424,7 +1438,8 @@ /area/ruin/space/has_grav/port_tarkon/porthall) "jj" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -1773,7 +1788,8 @@ /area/ruin/space/has_grav/port_tarkon/secoff) "ld" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -1980,7 +1996,7 @@ /obj/effect/turf_decal/tile/red/fourcorners{ color = "#DE3A3A" }, -/obj/machinery/computer/atmos_control/nitrogen_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrogen_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2232,8 +2248,8 @@ "om" = ( /obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/carbon_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/carbon_tank{ + pixel_x = 26 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2300,7 +2316,8 @@ /area/ruin/space/has_grav/port_tarkon/storage) "oI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2320,7 +2337,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark/fourcorners, -/obj/machinery/computer/atmos_control/carbon_tank{ +/obj/machinery/computer/atmos_control/tarkon/carbon_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2448,11 +2465,9 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/starboardhall) "pz" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, /obj/machinery/door/firedoor/solid, -/turf/open/floor/iron, +/obj/effect/spawner/structure/window/reinforced/no_firelock, +/turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/garden) "pA" = ( /obj/effect/turf_decal/vg_decals/atmos/mix, @@ -2514,7 +2529,8 @@ /area/ruin/space/has_grav/port_tarkon/secoff) "pU" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2579,7 +2595,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/computer/atmos_control/oxygen_tank{ +/obj/machinery/computer/atmos_control/tarkon/oxygen_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2722,6 +2738,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/crowbar, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/cargo) "rv" = ( @@ -2767,7 +2784,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/airalarm/directional/south, +/obj/machinery/airalarm/all_access{ + pixel_y = -20 + }, /obj/effect/turf_decal/tile/brown/half, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/storage) @@ -2822,8 +2841,8 @@ "rL" = ( /obj/effect/turf_decal/vg_decals/atmos/oxygen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/oxygen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/oxygen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2863,9 +2882,11 @@ /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "sc" = ( -/obj/machinery/air_sensor/incinerator_tank, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/air_sensor/tarkon/incinerator_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "sd" = ( @@ -2883,7 +2904,8 @@ /area/ruin/space/has_grav/port_tarkon/atmos) "sj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3000,7 +3022,8 @@ /area/ruin/space/has_grav/port_tarkon/kitchen) "te" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3484,6 +3507,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "wl" = ( @@ -3544,7 +3568,7 @@ /turf/open/misc/asteroid/airless, /area/solars/tarkon) "wW" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_tarkon{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, @@ -3592,7 +3616,8 @@ /area/ruin/space/has_grav/port_tarkon/trauma) "xj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3623,7 +3648,7 @@ /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav/port_tarkon/developement) "xB" = ( -/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/igniter/incinerator_tarkon, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 5 }, @@ -3805,7 +3830,9 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/port_tarkon/dorms) "yC" = ( -/obj/machinery/air_sensor/air_tank, +/obj/machinery/air_sensor/tarkon/mix_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "yD" = ( @@ -3982,7 +4009,8 @@ /area/ruin/space/has_grav/port_tarkon/trauma) "Ak" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4039,7 +4067,8 @@ /area/ruin/space/has_grav/port_tarkon/atmos) "AF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4706,14 +4735,8 @@ "Fl" = ( /obj/item/electronics/apc, /obj/item/electronics/apc, -/obj/item/electronics/apc, -/obj/item/electronics/apc, /obj/item/electronics/airlock, /obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airalarm, -/obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/structure/closet/crate/engineering/electrical{ @@ -4722,7 +4745,13 @@ /obj/item/electronics/tracker, /obj/item/stack/cable_coil, /obj/item/clothing/gloves/color/yellow, -/obj/effect/decal/cleanable/dirt/dust, +/obj/item/circuitboard/computer/atmos_control/tarkon/carbon_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/mix_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/nitrogen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/incinerator, +/obj/item/circuitboard/computer/atmos_control/tarkon/oxygen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/plasma_tank, +/obj/item/circuitboard/computer/tarkon_driver, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/forehall) "Fm" = ( @@ -4744,12 +4773,11 @@ /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "Fs" = ( -/obj/machinery/airlock_sensor/incinerator_atmos{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 +/obj/machinery/airlock_sensor/incinerator_tarkon{ + pixel_x = 6; + pixel_y = 23 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "Ft" = ( @@ -4937,8 +4965,8 @@ "GB" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/nitrous_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/nitrous_tank{ + pixel_x = 26 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -5185,7 +5213,7 @@ /area/solars/tarkon) "Ih" = ( /obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/door/firedoor/solid, +/obj/machinery/door/firedoor/solid/closed, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5624,7 +5652,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/storage) "KM" = ( -/obj/machinery/button/ignition/incinerator/atmos, +/obj/machinery/button/ignition/incinerator/tarkon, /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "KO" = ( @@ -5690,7 +5718,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/observ) "Ld" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_exterior, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -5911,6 +5939,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/power1) +"MP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "MS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/glass, @@ -6241,7 +6274,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/mining) "Pq" = ( -/obj/machinery/door/firedoor/solid, +/obj/machinery/door/firedoor/solid/closed, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/storage) "Ps" = ( @@ -6369,7 +6402,8 @@ /area/ruin/space/has_grav/port_tarkon/cargo) "Qk" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -6402,7 +6436,7 @@ }, /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/cable, -/obj/machinery/computer/atmos_control/plasma_tank{ +/obj/machinery/computer/atmos_control/tarkon/plasma_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -6442,7 +6476,8 @@ /area/ruin/space/has_grav/port_tarkon/cargo) "QH" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -6509,7 +6544,8 @@ /area/ruin/space/has_grav/port_tarkon/mining) "Rf" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -6668,8 +6704,8 @@ "RY" = ( /obj/effect/turf_decal/vg_decals/atmos/plasma, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/plasma_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/plasma_tank{ + pixel_x = 26 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -6881,6 +6917,7 @@ }, /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "Tk" = ( @@ -7131,9 +7168,7 @@ /area/ruin/space/has_grav/port_tarkon/centerhall) "UI" = ( /obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "UJ" = ( @@ -7335,8 +7370,8 @@ "Wd" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrogen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/nitrogen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/nitrogen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7422,7 +7457,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/atmos_control/air_tank{ +/obj/machinery/computer/atmos_control/tarkon/mix_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -7777,7 +7812,6 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/toolstorage) "Zq" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark/airless, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7799,7 +7833,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/computer/atmos_control/nitrous_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrous_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -9118,7 +9152,7 @@ FO BX BX iW -aZ +Fh Zq hP QW @@ -9339,8 +9373,8 @@ FO BX jG lQ -lQ -xt +gH +fk xt WY zo @@ -9414,7 +9448,7 @@ Me hf hf xt -sv +xt zo zo sv @@ -11515,10 +11549,10 @@ LS LS MF gJ -Yv +aZ XT -XG -XG +MP +MP XT Yv hj @@ -11590,7 +11624,7 @@ mT gJ gJ gJ -bA +pz pz gJ gJ diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm index 8b7d0bd56b0..21620b6980e 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm @@ -170,11 +170,12 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "aZ" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/passive_vent, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) "ba" = ( @@ -603,6 +604,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/crowbar, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/secoff) "dB" = ( @@ -806,7 +808,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/mining) "eQ" = ( -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ +/obj/machinery/computer/atmos_control/tarkon/incinerator{ dir = 1 }, /obj/machinery/airalarm/all_access{ @@ -937,8 +939,8 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 8 }, -/obj/item/circuitboard/machine/sleeper, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/gun/medbeam/afad, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/trauma) "fJ" = ( @@ -968,7 +970,8 @@ /area/ruin/space/has_grav/port_tarkon/afthall) "fR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -1064,10 +1067,10 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "gs" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_interior, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_tarkon{ pixel_x = 40; - pixel_y = 8 + pixel_y = 5 }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -1332,10 +1335,8 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "hQ" = ( @@ -1564,7 +1565,8 @@ /area/ruin/space/has_grav/port_tarkon/porthall) "jj" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -1963,7 +1965,8 @@ /area/ruin/space/has_grav/port_tarkon/secoff) "ld" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2175,7 +2178,7 @@ /obj/effect/turf_decal/tile/red/fourcorners{ color = "#DE3A3A" }, -/obj/machinery/computer/atmos_control/nitrogen_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrogen_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2462,8 +2465,8 @@ "om" = ( /obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/carbon_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/carbon_tank{ + pixel_x = 26 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2570,7 +2573,8 @@ /area/ruin/space/has_grav/port_tarkon/comms) "oI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2595,7 +2599,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark/fourcorners, -/obj/machinery/computer/atmos_control/carbon_tank{ +/obj/machinery/computer/atmos_control/tarkon/carbon_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2716,11 +2720,9 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/starboardhall) "pz" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, /obj/machinery/door/firedoor/solid, -/turf/open/floor/iron, +/obj/effect/spawner/structure/window/reinforced/no_firelock, +/turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/garden) "pA" = ( /obj/effect/turf_decal/vg_decals/atmos/mix, @@ -2774,7 +2776,8 @@ "pP" = ( /obj/effect/spawner/random/trash/food_packaging, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, /area/ruin/space/has_grav/port_tarkon/garden) "pT" = ( /obj/structure/chair/office, @@ -2787,7 +2790,8 @@ /area/ruin/space/has_grav/port_tarkon/secoff) "pU" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -2850,7 +2854,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/computer/atmos_control/oxygen_tank{ +/obj/machinery/computer/atmos_control/tarkon/oxygen_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2935,10 +2939,9 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/starboardhall) "rd" = ( -/obj/machinery/hydroponics/soil, /obj/machinery/light/small/directional/east, -/obj/item/broken_bottle, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/biogenerator, /turf/open/floor/grass, /area/ruin/space/has_grav/port_tarkon/garden) "rg" = ( @@ -2987,6 +2990,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/crowbar, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/trauma) "rw" = ( @@ -3029,7 +3033,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/airalarm/directional/south, +/obj/machinery/airalarm/all_access{ + pixel_y = -20 + }, /obj/effect/turf_decal/tile/brown/half, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -3090,8 +3096,8 @@ "rL" = ( /obj/effect/turf_decal/vg_decals/atmos/oxygen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/oxygen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/oxygen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3129,9 +3135,11 @@ /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "sc" = ( -/obj/machinery/air_sensor/incinerator_tank, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/air_sensor/tarkon/incinerator_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "sd" = ( @@ -3143,7 +3151,8 @@ /area/ruin/space/has_grav/port_tarkon/starboardhall) "sj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3258,7 +3267,8 @@ /area/ruin/space/has_grav/port_tarkon/kitchen) "te" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3798,6 +3808,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "wm" = ( @@ -3866,13 +3877,19 @@ /turf/open/misc/asteroid/airless, /area/solars/tarkon) "wW" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_tarkon{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) +"wX" = ( +/obj/effect/decal/cleanable/confetti, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "wY" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -3908,7 +3925,8 @@ /area/ruin/space/has_grav/port_tarkon/trauma) "xj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/co2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -3945,7 +3963,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "xB" = ( -/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/igniter/incinerator_tarkon, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 5 }, @@ -4109,7 +4127,9 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/centerhall) "yC" = ( -/obj/machinery/air_sensor/air_tank, +/obj/machinery/air_sensor/tarkon/mix_tank{ + pixel_x = -26 + }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "yD" = ( @@ -4312,7 +4332,8 @@ /area/ruin/space/has_grav/port_tarkon/comms) "Ak" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4389,7 +4410,8 @@ /area/ruin/space/has_grav/port_tarkon/starboardhall) "AF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/o2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -4503,6 +4525,12 @@ /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/afthall) +"BC" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/broken_bottle, +/turf/open/floor/grass, +/area/ruin/space/has_grav/port_tarkon/garden) "BF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5151,14 +5179,8 @@ "Fl" = ( /obj/item/electronics/apc, /obj/item/electronics/apc, -/obj/item/electronics/apc, -/obj/item/electronics/apc, /obj/item/electronics/airlock, /obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airalarm, -/obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/item/electronics/airalarm, /obj/structure/closet/crate/engineering/electrical{ @@ -5167,6 +5189,13 @@ /obj/item/electronics/tracker, /obj/item/stack/cable_coil, /obj/item/clothing/gloves/color/yellow, +/obj/item/circuitboard/computer/atmos_control/tarkon/carbon_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/mix_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/nitrogen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/incinerator, +/obj/item/circuitboard/computer/atmos_control/tarkon/oxygen_tank, +/obj/item/circuitboard/computer/atmos_control/tarkon/plasma_tank, +/obj/item/circuitboard/computer/tarkon_driver, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/forehall) "Fm" = ( @@ -5195,12 +5224,11 @@ /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "Fs" = ( -/obj/machinery/airlock_sensor/incinerator_atmos{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 +/obj/machinery/airlock_sensor/incinerator_tarkon{ + pixel_x = 6; + pixel_y = 23 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) "Ft" = ( @@ -5389,8 +5417,8 @@ "GB" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/nitrous_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/nitrous_tank{ + pixel_x = 26 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -6158,7 +6186,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/port_tarkon/storage) "KM" = ( -/obj/machinery/button/ignition/incinerator/atmos, +/obj/machinery/button/ignition/incinerator/tarkon, /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/atmos) "KO" = ( @@ -6223,7 +6251,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/observ) "Ld" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_exterior, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -6781,6 +6809,13 @@ "OM" = ( /turf/closed/wall/r_wall, /area/ruin/space/has_grav/port_tarkon/comms) +"OQ" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/port_tarkon/atmos) "OR" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -7004,7 +7039,8 @@ /area/ruin/space/has_grav/port_tarkon/afthall) "Qk" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7039,7 +7075,7 @@ }, /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/cable, -/obj/machinery/computer/atmos_control/plasma_tank{ +/obj/machinery/computer/atmos_control/tarkon/plasma_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -7083,7 +7119,8 @@ /area/ruin/space/has_grav/port_tarkon/porthall) "QH" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ - dir = 4 + dir = 4; + frequency = 1243 }, /turf/open/floor/engine/vacuum, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7148,7 +7185,8 @@ /area/ruin/space/has_grav/port_tarkon/mining) "Rf" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ - dir = 8 + dir = 8; + frequency = 1243 }, /turf/open/floor/engine/n2o, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7310,8 +7348,8 @@ "RY" = ( /obj/effect/turf_decal/vg_decals/atmos/plasma, /obj/machinery/light/small/directional/east, -/obj/machinery/air_sensor/plasma_tank{ - pixel_x = 23 +/obj/machinery/air_sensor/tarkon/plasma_tank{ + pixel_x = 26 }, /turf/open/floor/engine/plasma, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -7537,6 +7575,7 @@ }, /obj/structure/rack/shelf, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/crowbar, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/storage) "Te" = ( @@ -7556,6 +7595,7 @@ }, /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/ruin/space/has_grav/port_tarkon/atmos) "Tk" = ( @@ -7764,6 +7804,7 @@ /obj/structure/table/reinforced, /obj/item/circuitboard/machine/anomaly_refinery, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/crowbar, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/developement) "Ug" = ( @@ -7837,9 +7878,7 @@ /area/ruin/space/has_grav/port_tarkon) "UI" = ( /obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "UJ" = ( @@ -8066,8 +8105,8 @@ "Wd" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrogen, /obj/machinery/light/small/directional/west, -/obj/machinery/air_sensor/nitrogen_tank{ - pixel_x = -23 +/obj/machinery/air_sensor/tarkon/nitrogen_tank{ + pixel_x = -26 }, /turf/open/floor/engine/n2, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -8154,7 +8193,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/atmos_control/air_tank{ +/obj/machinery/computer/atmos_control/tarkon/mix_tank{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -8569,7 +8608,6 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon/toolstorage) "Zq" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/atmos) @@ -8587,6 +8625,7 @@ /obj/item/broken_bottle, /obj/effect/decal/cleanable/confetti, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/crowbar, /turf/open/floor/plating, /area/ruin/space/has_grav/port_tarkon/atmos) "Zw" = ( @@ -8595,7 +8634,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/computer/atmos_control/nitrous_tank{ +/obj/machinery/computer/atmos_control/tarkon/nitrous_tank{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -9937,7 +9976,7 @@ VG SM VG VG -aZ +Fh Zq hP QW @@ -10158,8 +10197,8 @@ VG VG jG lQ -lQ -xt +aZ +OQ xt WY zo @@ -10233,7 +10272,7 @@ Me hf hf xt -sv +xt zo zo sv @@ -12261,7 +12300,7 @@ AG cU vn gJ -Uv +pP yn XG XG @@ -12335,9 +12374,9 @@ Om MF gJ rd -XT +BC pP -yn +wX XT Yv hj @@ -12409,7 +12448,7 @@ mT gJ gJ gJ -bA +pz pz gJ gJ diff --git a/code/__DEFINES/~skyrat_defines/_HELPERS/atmos_mapping_helpers.dm b/code/__DEFINES/~skyrat_defines/_HELPERS/atmos_mapping_helpers.dm new file mode 100644 index 00000000000..935e8ccf25e --- /dev/null +++ b/code/__DEFINES/~skyrat_defines/_HELPERS/atmos_mapping_helpers.dm @@ -0,0 +1,7 @@ +//Port Tarkon Incinerator +#define INCINERATOR_TARKON_IGNITER "tarkon_igniter" +#define INCINERATOR_TARKON_DP_VENTPUMP "tarkon_airlock_pump" +#define INCINERATOR_TARKON_AIRLOCK_SENSOR "tarkon_airlock_sensor" +#define INCINERATOR_TARKON_AIRLOCK_CONTROLLER "tarkon_airlock_controller" +#define INCINERATOR_TARKON_AIRLOCK_INTERIOR "tarkon_airlock_interior" +#define INCINERATOR_TARKON_AIRLOCK_EXTERIOR "tarkon_airlock_exterior" diff --git a/modular_skyrat/modules/mapping/code/atmos_control.dm b/modular_skyrat/modules/mapping/code/atmos_control.dm new file mode 100644 index 00000000000..eca574f5525 --- /dev/null +++ b/modular_skyrat/modules/mapping/code/atmos_control.dm @@ -0,0 +1,134 @@ +// Port Tarkon Atmos Control + +/obj/machinery/computer/atmos_control/tarkon + frequency = FREQ_TARKON + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon + +/obj/item/circuitboard/computer/atmos_control/tarkon + name = "Tarkon Atmospheric Control" + build_path = /obj/machinery/computer/atmos_control/tarkon + +/obj/machinery/air_sensor/tarkon + frequency = FREQ_TARKON + +/obj/machinery/computer/atmos_control/tarkon/oxygen_tank + name = "Tarkon Oxygen Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon/oxygen_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_O2 = "Oxygen Supply") + +/obj/item/circuitboard/computer/atmos_control/tarkon/oxygen_tank + name = "Tarkon Oxygen Supply Control" + build_path = /obj/machinery/computer/atmos_control/tarkon/oxygen_tank + +/obj/machinery/air_sensor/tarkon/oxygen_tank + name = "oxygen tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_O2 + +/obj/machinery/computer/atmos_control/tarkon/plasma_tank + name = "Tarkon Plasma Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon/plasma_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_PLAS = "Plasma Supply") + +/obj/item/circuitboard/computer/atmos_control/tarkon/plasma_tank + name = "Tarkon Plasma Supply Control" + build_path = /obj/machinery/computer/atmos_control/tarkon/plasma_tank + +/obj/machinery/air_sensor/tarkon/plasma_tank + name = "plasma tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_PLAS + +/obj/machinery/computer/atmos_control/tarkon/mix_tank + name = "Tarkon Mix Chamber Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon/mix_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_MIX = "Mix Chamber") + +/obj/item/circuitboard/computer/atmos_control/tarkon/mix_tank + name = "Tarkon Gas Mix Supply Control" + build_path = /obj/machinery/computer/atmos_control/tarkon/mix_tank + +/obj/machinery/air_sensor/tarkon/mix_tank + name = "mix tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_MIX + +/obj/machinery/computer/atmos_control/tarkon/nitrogen_tank + name = "Tarkon Nitrogen Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon/nitrogen_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_N2 = "Nitrogen Supply") + +/obj/item/circuitboard/computer/atmos_control/tarkon/nitrogen_tank + name = "Tarkon Nitrogen Supply Control" + build_path = /obj/machinery/computer/atmos_control/tarkon/nitrogen_tank + +/obj/machinery/air_sensor/tarkon/nitrogen_tank + name = "nitrogen tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_N2 + +/obj/machinery/computer/atmos_control/tarkon/nitrous_tank + name = "Tarkon Nitrous Oxide Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon/nitrous_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_N2O = "Nitrous Oxide Supply") + +/obj/item/circuitboard/computer/atmos_control/tarkon/nitrous_tank + name = "Tarkon Nitrous Oxide Supply Control" + build_path = /obj/machinery/computer/atmos_control/tarkon/nitrous_tank + +/obj/machinery/air_sensor/tarkon/nitrous_tank + name = "nitrous oxide tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_N2O + +/obj/machinery/computer/atmos_control/tarkon/carbon_tank + name = "Tarkon Carbon Dioxide Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon/carbon_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_CO2 = "Carbon Dioxide Supply") + +/obj/item/circuitboard/computer/atmos_control/tarkon/carbon_tank + name = "Tarkon Carbon Dioxide Supply Control" + build_path = /obj/machinery/computer/atmos_control/tarkon/carbon_tank + +/obj/machinery/air_sensor/tarkon/carbon_tank + name = "carbon dioxide tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_CO2 + +/obj/machinery/computer/atmos_control/tarkon/incinerator + name = "Tarkon Incinerator Chamber Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tarkon/incinerator + atmos_chambers = list(ATMOS_GAS_MONITOR_INCINERATOR = "Incinerator Chamber") + +/obj/item/circuitboard/computer/atmos_control/tarkon/incinerator + name = "Tarkon Incinerator Chamber Control" + build_path = /obj/machinery/computer/atmos_control/tarkon/incinerator + +/obj/machinery/air_sensor/tarkon/incinerator_tank + name = "incinerator chamber gas sensor" + chamber_id = ATMOS_GAS_MONITOR_INCINERATOR + +/obj/machinery/airlock_sensor/incinerator_tarkon + id_tag = INCINERATOR_TARKON_AIRLOCK_SENSOR + master_tag = INCINERATOR_TARKON_AIRLOCK_CONTROLLER + +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_interior + name = "Turbine Interior Airlock" + id_tag = INCINERATOR_TARKON_AIRLOCK_INTERIOR + +/obj/machinery/door/airlock/public/glass/incinerator/tarkon_exterior + name = "Turbine Exterior Airlock" + id_tag = INCINERATOR_TARKON_AIRLOCK_EXTERIOR + +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_tarkon + name = "Incinerator Access Console" + airpump_tag = INCINERATOR_TARKON_DP_VENTPUMP + exterior_door_tag = INCINERATOR_TARKON_AIRLOCK_EXTERIOR + id_tag = INCINERATOR_TARKON_AIRLOCK_CONTROLLER + interior_door_tag = INCINERATOR_TARKON_AIRLOCK_INTERIOR + sanitize_external = TRUE + sensor_tag = INCINERATOR_TARKON_AIRLOCK_SENSOR + +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_tarkon + id = INCINERATOR_TARKON_DP_VENTPUMP + frequency = FREQ_AIRLOCK_CONTROL + +/obj/machinery/igniter/incinerator_tarkon + id = INCINERATOR_TARKON_IGNITER + +/obj/machinery/button/ignition/incinerator/tarkon + id = INCINERATOR_TARKON_IGNITER diff --git a/modular_skyrat/modules/mapping/code/misc.dm b/modular_skyrat/modules/mapping/code/misc.dm index 056451bd6f7..22b3afcdbcc 100644 --- a/modular_skyrat/modules/mapping/code/misc.dm +++ b/modular_skyrat/modules/mapping/code/misc.dm @@ -16,6 +16,7 @@ /obj/item/mod/control/pre_equipped/prototype/hauler theme = /datum/mod_theme/prototype/hauler + req_access = list(ACCESS_TARKON) applied_cell = /obj/item/stock_parts/cell/high initial_modules = list(/obj/item/mod/module/storage/large_capacity, /obj/item/mod/module/welding, /obj/item/mod/module/clamp, /obj/item/mod/module/flashlight, /obj/item/mod/module/tether) diff --git a/tgstation.dme b/tgstation.dme index 334af6415bf..6b90868663e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -338,6 +338,7 @@ #include "code\__DEFINES\~skyrat_defines\turfs.dm" #include "code\__DEFINES\~skyrat_defines\vox_defines.dm" #include "code\__DEFINES\~skyrat_defines\_globalvars\lists\mapping.dm" +#include "code\__DEFINES\~skyrat_defines\_HELPERS\atmos_mapping_helpers.dm" #include "code\__DEFINES\~skyrat_defines\_HELPERS\lighting.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_lists.dm" @@ -5591,6 +5592,7 @@ #include "modular_skyrat\modules\lobby_cam\code\lobby_cam.dm" #include "modular_skyrat\modules\lobby_cam\code\lobby_eye_ss.dm" #include "modular_skyrat\modules\mapping\code\airless.dm" +#include "modular_skyrat\modules\mapping\code\atmos_control.dm" #include "modular_skyrat\modules\mapping\code\color.dm" #include "modular_skyrat\modules\mapping\code\dungeon.dm" #include "modular_skyrat\modules\mapping\code\fluff.dm"