From 548939af68c7df31053c10b9c579356a7df8032e Mon Sep 17 00:00:00 2001 From: Selis Date: Sat, 2 Apr 2022 21:09:17 +0200 Subject: [PATCH 1/5] Added missing pipes & moved scrubbers pump in Atmos --- maps/groundbase/gb-z1.dmm | 52 ++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 98abd1ea60..34aa8adb5a 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -7361,6 +7361,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, /turf/simulated/floor, /area/groundbase/engineering/storage) "um" = ( @@ -10457,8 +10463,12 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) "Cy" = ( @@ -11550,6 +11560,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) "FP" = ( @@ -12537,11 +12553,17 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/storage) "ID" = ( -/obj/machinery/atmospherics/binary/pump/on{ - name = "Scrubber to Waste" +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/groundbase/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/storage) "IE" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/civilian/arrivals) @@ -14852,6 +14874,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) +"OP" = ( +/obj/machinery/atmospherics/binary/pump/on{ + name = "Scrubber to Waste" + }, +/turf/simulated/floor/tiled/techmaint, +/area/groundbase/engineering/atmos) "OQ" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide, /turf/simulated/floor/tiled/techmaint, @@ -15610,6 +15638,12 @@ /obj/machinery/status_display{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) "Rn" = ( @@ -31956,7 +31990,7 @@ IX IX ig JM -Zx +ID dX KD Ra @@ -34084,13 +34118,13 @@ Ae Hr Wu uL -ID +rt jM jt jt jt jt -rt +OP vg lZ vg From f8bc03f339d986e9f48fc606c99e660e00e26a35 Mon Sep 17 00:00:00 2001 From: Selis Date: Sat, 2 Apr 2022 21:45:49 +0200 Subject: [PATCH 2/5] Fixed gas leaks not appearing outside --- code/modules/events/atmos_leak.dm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm index 7d08a2e196..0a01fc8e81 100644 --- a/code/modules/events/atmos_leak.dm +++ b/code/modules/events/atmos_leak.dm @@ -14,7 +14,25 @@ /area/shuttle, /area/crew_quarters, /area/holodeck, - /area/engineering/engine_room + /area/engineering/engine_room, + /area/groundbase/level1/centsquare, + /area/groundbase/level1/eastspur, + /area/groundbase/level1/northspur, + /area/groundbase/level1/southeastspur, + /area/groundbase/level1/southwestspur, + /area/groundbase/level1/westspur, + /area/maintenance/groundbase/level1/netunnel, + /area/maintenance/groundbase/level1/nwtunnel, + /area/maintenance/groundbase/level1/setunnel, + /area/maintenance/groundbase/level1/swtunnel, + /area/groundbase/level3/ne, + /area/groundbase/level3/nw, + /area/groundbase/level3/se, + /area/groundbase/level3/sw, + /area/groundbase/level3/ne, + /area/groundbase/level3/nw, + /area/groundbase/level3/se, + /area/groundbase/level3/sw ) // Decide which area will be targeted! From 35b1b441f1f7d8899d1fa93e4c689cf47ce9821e Mon Sep 17 00:00:00 2001 From: Selis Date: Sat, 2 Apr 2022 22:27:09 +0200 Subject: [PATCH 3/5] Isolating the map-specific code where it actually belongs --- code/modules/events/atmos_leak.dm | 20 +------------------- maps/groundbase/groundbase_areas.dm | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm index 0a01fc8e81..7d08a2e196 100644 --- a/code/modules/events/atmos_leak.dm +++ b/code/modules/events/atmos_leak.dm @@ -14,25 +14,7 @@ /area/shuttle, /area/crew_quarters, /area/holodeck, - /area/engineering/engine_room, - /area/groundbase/level1/centsquare, - /area/groundbase/level1/eastspur, - /area/groundbase/level1/northspur, - /area/groundbase/level1/southeastspur, - /area/groundbase/level1/southwestspur, - /area/groundbase/level1/westspur, - /area/maintenance/groundbase/level1/netunnel, - /area/maintenance/groundbase/level1/nwtunnel, - /area/maintenance/groundbase/level1/setunnel, - /area/maintenance/groundbase/level1/swtunnel, - /area/groundbase/level3/ne, - /area/groundbase/level3/nw, - /area/groundbase/level3/se, - /area/groundbase/level3/sw, - /area/groundbase/level3/ne, - /area/groundbase/level3/nw, - /area/groundbase/level3/se, - /area/groundbase/level3/sw + /area/engineering/engine_room ) // Decide which area will be targeted! diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 39b031b7db..e9d2617b52 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -358,3 +358,25 @@ icon_state = "orablacir" /area/groundbase/mining/explored icon_state = "blublacir" + +// Exclude some more areas from the atmos leak event since its outside. +/datum/event/atmos_leak/setup() + excluded |= /area/groundbase/level1/centsquare + excluded |= /area/groundbase/level1/eastspur + excluded |= /area/groundbase/level1/northspur + excluded |= /area/groundbase/level1/southeastspur + excluded |= /area/groundbase/level1/southwestspur + excluded |= /area/groundbase/level1/westspur + excluded |= /area/maintenance/groundbase/level1/netunnel + excluded |= /area/maintenance/groundbase/level1/nwtunnel + excluded |= /area/maintenance/groundbase/level1/setunnel + excluded |= /area/maintenance/groundbase/level1/swtunnel + excluded |= /area/groundbase/level3/ne + excluded |= /area/groundbase/level3/nw + excluded |= /area/groundbase/level3/se + excluded |= /area/groundbase/level3/sw + excluded |= /area/groundbase/level3/ne + excluded |= /area/groundbase/level3/nw + excluded |= /area/groundbase/level3/se + excluded |= /area/groundbase/level3/sw + ..() \ No newline at end of file From 224d9aa03bd3865ebdbc6bb547cf46dd21279181 Mon Sep 17 00:00:00 2001 From: Selis Date: Sun, 3 Apr 2022 00:50:44 +0200 Subject: [PATCH 4/5] Fixed typo --- maps/groundbase/groundbase_areas.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index e9d2617b52..92fd7c1319 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -371,12 +371,12 @@ excluded |= /area/maintenance/groundbase/level1/nwtunnel excluded |= /area/maintenance/groundbase/level1/setunnel excluded |= /area/maintenance/groundbase/level1/swtunnel + excluded |= /area/groundbase/level2/ne + excluded |= /area/groundbase/level2/nw + excluded |= /area/groundbase/level2/se + excluded |= /area/groundbase/level2/sw excluded |= /area/groundbase/level3/ne excluded |= /area/groundbase/level3/nw excluded |= /area/groundbase/level3/se excluded |= /area/groundbase/level3/sw - excluded |= /area/groundbase/level3/ne - excluded |= /area/groundbase/level3/nw - excluded |= /area/groundbase/level3/se - excluded |= /area/groundbase/level3/sw - ..() \ No newline at end of file + ..() From b013381e213fba0810a1297c44803784c68f3a58 Mon Sep 17 00:00:00 2001 From: Selis Date: Sun, 3 Apr 2022 03:03:44 +0200 Subject: [PATCH 5/5] Added missing maintenance tunnel --- maps/groundbase/groundbase_areas.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 92fd7c1319..b90ae2f892 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -369,6 +369,7 @@ excluded |= /area/groundbase/level1/westspur excluded |= /area/maintenance/groundbase/level1/netunnel excluded |= /area/maintenance/groundbase/level1/nwtunnel + excluded |= /area/maintenance/groundbase/level1/stunnel excluded |= /area/maintenance/groundbase/level1/setunnel excluded |= /area/maintenance/groundbase/level1/swtunnel excluded |= /area/groundbase/level2/ne