Merge pull request #12600 from ItsSelis/patch-2

Tiny pipe fix & gas leak event fix
This commit is contained in:
Casey
2022-04-02 22:18:38 -04:00
committed by GitHub
2 changed files with 66 additions and 9 deletions

View File

@@ -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

View File

@@ -358,3 +358,26 @@
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/stunnel
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
..()