From 1a8becd9986d351e6eccc383be613e092049795e Mon Sep 17 00:00:00 2001 From: Neth Date: Mon, 5 Sep 2022 03:12:16 +0300 Subject: [PATCH] Makes that Turbine Scrubbers no longer fight against Turbine itself (#18879) * moved turbine siphon * injectors into vents --- _maps/map_files/Delta/delta.dmm | 51 +++-- _maps/map_files/MetaStation/MetaStation.dmm | 204 ++++++++++++-------- _maps/map_files/cyberiad/cyberiad.dmm | 30 ++- 3 files changed, 175 insertions(+), 110 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index fd5e20af74b..4e897b129f0 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -13153,8 +13153,9 @@ /turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aNU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6; + level = 1 }, /turf/simulated/floor/engine, /area/maintenance/incinerator) @@ -13188,7 +13189,7 @@ /turf/simulated/floor/engine, /area/maintenance/incinerator) "aNY" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -13666,6 +13667,9 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, /turf/simulated/floor/engine, /area/maintenance/incinerator) "aPm" = ( @@ -13682,6 +13686,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, /turf/simulated/floor/engine, /area/maintenance/incinerator) "aPn" = ( @@ -13694,6 +13701,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/engine, /area/maintenance/incinerator) "aPo" = ( @@ -13744,6 +13754,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/binary/valve{ + name = "Exhaust Reuse" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -13761,7 +13774,9 @@ }, /area/maintenance/incinerator) "aPt" = ( -/obj/machinery/atmospherics/binary/valve, +/obj/machinery/atmospherics/binary/valve{ + name = "Exhaust Disposal" + }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -14352,10 +14367,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboard2) "aQM" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 4; - frequency = 1441; - id = "mix_in" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/engine, /area/maintenance/incinerator) @@ -14406,9 +14419,7 @@ dir = 1; id = "incineratorturbine" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -97485,6 +97496,12 @@ icon_state = "darkredcorners" }, /area/security/prison/cell_block) +"wok" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/maintenance/incinerator) "wpr" = ( /obj/structure/cable{ d1 = 4; @@ -118460,9 +118477,9 @@ abj aLQ abj aLT -abj -aaa -abj +aNT +aPk +aNT acF aaa abj @@ -118717,9 +118734,9 @@ aGX aJK aGX acF -aNT -aPk -aNT +aGZ +wok +aGZ aWR abj abj diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5e06993d707..1ad262e510e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -11635,9 +11635,6 @@ /turf/simulated/floor/carpet, /area/lawoffice) "aRQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/maintenance/turbine) @@ -18368,10 +18365,10 @@ /area/security/checkpoint2) "biB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, /obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/maintenance/turbine) "biC" = ( @@ -19399,7 +19396,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bkY" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -19415,8 +19411,10 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/turbine) "bla" = ( @@ -22436,7 +22434,6 @@ }, /area/hallway/primary/port) "brW" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/binary/valve, /turf/simulated/floor/plasteel, @@ -30003,12 +30000,6 @@ /obj/structure/table/wood, /turf/simulated/floor/wood, /area/library) -"bKx" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "bKy" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -31930,13 +31921,8 @@ /turf/simulated/floor/wood, /area/maintenance/apmaint) "bQA" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 0; - initialize_directions = 1; - internal_pressure_bound = 4000; - pressure_checks = 2; - releasing = 0 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 }, /turf/simulated/floor/engine/vacuum, /area/maintenance/turbine) @@ -34619,7 +34605,6 @@ /turf/simulated/floor/wood, /area/library) "bXO" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, @@ -34824,6 +34809,7 @@ "bYh" = ( /obj/structure/cable, /obj/machinery/power/turbine, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/engine/vacuum, /area/maintenance/turbine) "bYi" = ( @@ -38969,11 +38955,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/turbine) "cjD" = ( @@ -39127,15 +39110,6 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/maintenance/turbine) -"ckc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/maintenance/turbine) "ckd" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, @@ -39606,7 +39580,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/turbine) "clz" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -39636,7 +39609,6 @@ /turf/simulated/floor/plating, /area/maintenance/port) "clF" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, @@ -41289,7 +41261,6 @@ /area/maintenance/turbine) "cqQ" = ( /obj/machinery/atmospherics/binary/pump/on, -/obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/turbine) @@ -42051,11 +42022,6 @@ /obj/machinery/chem_heater, /turf/simulated/floor/plating, /area/maintenance/starboard2) -"cts" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "ctt" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -42561,10 +42527,8 @@ name = "EXTERNAL AIRLOCK"; pixel_y = -32 }, -/obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 1; - frequency = 1443; - id = "air_in" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/engine/vacuum, /area/maintenance/turbine) @@ -42595,6 +42559,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, /turf/simulated/floor/engine/vacuum, /area/maintenance/turbine) "cuS" = ( @@ -43090,6 +43057,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/engine/vacuum, /area/maintenance/turbine) "cwC" = ( @@ -45721,6 +45689,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/atmospherics/meter, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/turbine) "cEE" = ( @@ -58007,16 +57978,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/medmaint) -"fyZ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/space, -/area/space/nearstation) "fza" = ( /obj/effect/turf_decal/bot, /obj/structure/sink{ @@ -58947,6 +58908,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"fVW" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "fWg" = ( /obj/structure/chair/stool{ dir = 1 @@ -62682,6 +62653,14 @@ icon_state = "red" }, /area/security/prison/cell_block/A) +"hNa" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/space, +/area/space/nearstation) "hNv" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 @@ -64210,6 +64189,19 @@ }, /turf/simulated/floor/plasteel, /area/assembly/robotics) +"iAP" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel, +/area/maintenance/turbine) "iAS" = ( /obj/machinery/vending/hatdispenser, /obj/machinery/light, @@ -72086,6 +72078,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) +"mpF" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/atmos) "mpP" = ( /obj/machinery/atmospherics/binary/volume_pump/on{ dir = 8; @@ -75856,6 +75855,11 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"omW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/segment, +/turf/space, +/area/space/nearstation) "onF" = ( /obj/item/radio/intercom{ name = "north bump"; @@ -77181,6 +77185,14 @@ icon_state = "white" }, /area/medical/paramedic) +"oYa" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/space, +/area/space/nearstation) "oYO" = ( /turf/simulated/floor/plasteel{ icon_state = "C1" @@ -79665,6 +79677,18 @@ /area/quartermaster/miningdock{ name = "\improper Mining Office" }) +"qlS" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/binary/valve{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/maintenance/turbine) "qlX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -80454,6 +80478,12 @@ icon_state = "neutralcorner" }, /area/hallway/primary/aft) +"qMg" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ + dir = 1 + }, +/turf/simulated/floor/engine/vacuum, +/area/maintenance/turbine) "qMU" = ( /obj/structure/cable/yellow{ d2 = 2; @@ -92938,6 +92968,14 @@ }, /turf/simulated/floor/plasteel, /area/engine/hardsuitstorage) +"xfm" = ( +/obj/structure/lattice/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/space, +/area/space/nearstation) "xfn" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -134227,18 +134265,18 @@ asJ lRY aoG ciF -ckc +clz clz bkY brW clF cqQ -bKx -bKx -bKx +qee +qee +qee bXO -cts -fyZ +aaa +aaa aaa aaa aaa @@ -134494,7 +134532,7 @@ clA clA clA cyn -abq +aaa aaa aaa aaa @@ -134751,12 +134789,12 @@ clB bQA clA clA +clA cyu aaa aaa aaa aaa -aaa ivU ten cZr @@ -134999,8 +135037,8 @@ aoG cgW chX cjB -cmM -cmM +iAP +qlS cmM cqa cqP @@ -135008,12 +135046,12 @@ ctn cuQ cwB bYh +qMg ctv aaa aaa aaa aaa -aaa ivU gpe cuw @@ -135265,9 +135303,9 @@ clB cuO clA clA +clA cyu bNP -iju abq iju abq @@ -135513,7 +135551,7 @@ axh bCM fmX bCM -bzL +mpF clA clA clA @@ -135521,9 +135559,9 @@ clA clA bSl clA -aaa -aaa -aaa +hNa +omW +fVW aaa aaa aaa @@ -135770,15 +135808,15 @@ bCU rjm pmE bCM -abq -abq -abq -abq -abq -abq -abq -aaa -aaa +oYa +omW +omW +omW +omW +omW +omW +omW +xfm aaa aaa aaa diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 7676d849879..f88226d8fe0 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -66362,20 +66362,18 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/port) "dmy" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 1; - frequency = 1443; - id = "air_in" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/engine, /area/maintenance/turbine) "dmz" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - dir = 1 - }, /obj/structure/sign/vacuum{ pixel_y = -30 }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/engine, /area/maintenance/turbine) "dmA" = ( @@ -66387,6 +66385,10 @@ /obj/machinery/igniter{ id = "gasturbine" }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6; + level = 1 + }, /turf/simulated/floor/engine, /area/maintenance/turbine) "dmB" = ( @@ -66486,6 +66488,7 @@ comp_id = "incineratorturbine"; dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/engine, /area/maintenance/turbine) "dmP" = ( @@ -66650,6 +66653,7 @@ "dne" = ( /obj/structure/cable, /obj/machinery/power/turbine, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/engine, /area/maintenance/turbine) "dnf" = ( @@ -84576,6 +84580,12 @@ icon_state = "dark" }, /area/engine/engineering) +"qIz" = ( +/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/maintenance/turbine) "qIW" = ( /obj/structure/cable{ d1 = 1; @@ -131987,8 +131997,8 @@ dln dmy dgS dgS +dgS dnx -aaa doE aaa aaa @@ -132244,8 +132254,8 @@ dmh dmA dmO dne +qIz dnI -aaa doE aaa aaa @@ -132501,8 +132511,8 @@ dln dmz dgS dgS +dgS dnx -aaa doE aaa aaa