From 0806086f66028fac0d2c144d9083fce226648941 Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Thu, 11 Oct 2018 22:24:41 +0100 Subject: [PATCH 1/4] fixes the siphoning vents in viro, engi hallway and janitor room --- _maps/map_files/YogStation/YogStation.dmm | 27 +++-------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 13dad5cab646..d80db87005de 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -35259,14 +35259,7 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "n2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2; - pressure_resistance = 10; - pump_direction = 0 + dir = 4 }, /turf/open/floor/plasteel, /area/janitor) @@ -38929,14 +38922,7 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "o2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2; - pressure_resistance = 10; - pump_direction = 0 + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -42645,14 +42631,7 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "n2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2; - pressure_resistance = 10; - pump_direction = 0 + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) From da44441b9389b5f71a17eb42bba52951b9935a99 Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Thu, 11 Oct 2018 23:50:54 +0100 Subject: [PATCH 2/4] changes camera c_tags for atmos+viro --- _maps/map_files/YogStation/YogStation.dmm | 26 +++++++++++++---------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index d80db87005de..0c19098681f3 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -39811,7 +39811,7 @@ /area/medical/virology) "bOn" = ( /obj/machinery/camera{ - c_tag = "Chapel North"; + c_tag = "Virology Module"; dir = 2 }, /obj/effect/turf_decal/tile/yellow{ @@ -49527,7 +49527,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Research Division South"; + c_tag = "Atmospherics Tanks East"; dir = 8 }, /obj/item/radio/intercom{ @@ -52475,7 +52475,7 @@ dir = 8 }, /obj/machinery/camera{ - c_tag = "Circuitry Lab"; + c_tag = "Atmospherics West"; dir = 4; network = list("ss13","rd") }, @@ -52747,7 +52747,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Medbay Treatment Center"; + c_tag = "Atmospherics Storage"; dir = 8 }, /obj/machinery/airalarm{ @@ -53058,6 +53058,10 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/light, +/obj/machinery/camera{ + c_tag = "Atmospherics Monitoring"; + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "gVe" = ( @@ -54861,7 +54865,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Atmospherics North West"; + c_tag = "Atmospherics Corridor North"; dir = 4 }, /turf/open/floor/plasteel, @@ -56657,7 +56661,7 @@ /area/engine/atmos) "rqq" = ( /obj/machinery/camera{ - c_tag = "Atmospherics Access"; + c_tag = "Atmospherics Corridor West"; dir = 4 }, /obj/machinery/light{ @@ -56795,7 +56799,7 @@ /area/engine/atmos) "rPO" = ( /obj/machinery/camera{ - c_tag = "Circuitry Lab"; + c_tag = "Atmospherics South West"; dir = 4; network = list("ss13","rd") }, @@ -56845,7 +56849,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Research Division South"; + c_tag = "Atmospherics East"; dir = 8 }, /obj/machinery/firealarm{ @@ -57354,7 +57358,7 @@ /area/engine/atmos) "tkb" = ( /obj/machinery/camera{ - c_tag = "Gateway"; + c_tag = "Atmospherics North West"; dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -58448,7 +58452,7 @@ /obj/item/reagent_containers/blood/APlus, /obj/item/reagent_containers/blood/random, /obj/machinery/camera{ - c_tag = "Auxillary Base Construction"; + c_tag = "Virology Break Room"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -58739,7 +58743,7 @@ /area/engine/atmos) "xtz" = ( /obj/machinery/camera{ - c_tag = "Dormitory South"; + c_tag = "Atmospherics Mix Tank"; dir = 4 }, /turf/open/floor/engine/vacuum, From e0e6673f25c9931ef060a8d043b9706360c0f5d8 Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Fri, 12 Oct 2018 10:16:46 +0100 Subject: [PATCH 3/4] makes the turbine work --- _maps/map_files/YogStation/YogStation.dmm | 38 +++++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 0c19098681f3..03a6cbd287ce 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -48403,7 +48403,9 @@ /turf/open/floor/plating, /area/tcommsat/entrance) "cub" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector, +/obj/machinery/atmospherics/components/unary/outlet_injector{ + on = 1 + }, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "cuf" = ( @@ -51222,15 +51224,20 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cSf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump{ - icon_state = "vent_map"; - dir = 8 - }, /obj/structure/sign/warning/vacuum{ name = "EXTERNAL AIRLOCK"; pixel_x = 32; pixel_y = 0 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8; + external_pressure_bound = 0; + initialize_directions = 1; + internal_pressure_bound = 4000; + on = 0; + pressure_checks = 2; + pump_direction = 0 + }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "cSz" = ( @@ -52219,8 +52226,9 @@ /area/space/nearstation) "eGn" = ( /obj/machinery/power/turbine{ + dir = 4; icon_state = "turbine"; - dir = 4 + luminosity = 2 }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -54101,8 +54109,11 @@ /area/medical/virology) "kaF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector{ + dir = 8; + frequency = 1443; icon_state = "inje_map"; - dir = 8 + id = "air_in"; + on = 1 }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) @@ -56830,7 +56841,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/computer/turbine_computer, +/obj/machinery/computer/turbine_computer{ + id = "incineratorturbine" + }, /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -57608,7 +57621,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/igniter, +/obj/machinery/igniter{ + id = "Incinerator"; + luminosity = 2 + }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "ulJ" = ( @@ -58719,8 +58735,10 @@ /area/engine/atmos) "xoA" = ( /obj/machinery/power/compressor{ + comp_id = "incineratorturbine"; + dir = 8; icon_state = "compressor"; - dir = 8 + luminosity = 1 }, /obj/structure/cable/yellow{ icon_state = "0-8" From 8248911074d3d3186bb8e4e1b5003192bc2aaa2f Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Fri, 12 Oct 2018 12:42:32 +0100 Subject: [PATCH 4/4] air mixer --- _maps/map_files/YogStation/YogStation.dmm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 03a6cbd287ce..47675b050996 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -52149,10 +52149,13 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "esg" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped{ +/obj/machinery/atmospherics/components/trinary/mixer/flipped{ dir = 4; - icon_state = "filter_on_f"; - name = "Air Mixer" + icon_state = "mixer_off_f"; + name = "Air Mixer"; + node1_concentration = 0.8; + node2_concentration = 0.2; + on = 1 }, /turf/open/floor/plasteel, /area/engine/atmos)