Merge pull request #14078 from MrJWhit/metastation-toxins-fix-2-electric-bogaloo

Gives metastation toxins storage a scrubber 'n vent
This commit is contained in:
silicons
2021-01-20 15:21:55 -07:00
committed by GitHub

View File

@@ -60135,9 +60135,6 @@
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/disposalpipe/junction/flip{ /obj/structure/disposalpipe/junction/flip{
dir = 8 dir = 8
}, },
@@ -60145,6 +60142,9 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 4 dir = 4
}, },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/research) /area/science/research)
"cpx" = ( "cpx" = (
@@ -60947,9 +60947,6 @@
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
@@ -60958,6 +60955,10 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/research) /area/science/research)
"cqP" = ( "cqP" = (
@@ -61465,7 +61466,6 @@
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor, /obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/research{ /obj/machinery/door/airlock/research{
@@ -61477,6 +61477,7 @@
name = "biohazard containment shutters" name = "biohazard containment shutters"
}, },
/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/storage) /area/science/storage)
"crU" = ( "crU" = (
@@ -62156,11 +62157,11 @@
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 9 dir = 9
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/storage) /area/science/storage)
"cth" = ( "cth" = (
@@ -62531,24 +62532,21 @@
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-4" icon_state = "1-4"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 5 dir = 5
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 8 dir = 8
}, },
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/storage) /area/science/storage)
"ctY" = ( "ctY" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
/obj/structure/chair/stool, /obj/structure/chair/stool,
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 10 dir = 10
@@ -62568,10 +62566,6 @@
/area/science/storage) /area/science/storage)
"cua" = ( "cua" = (
/obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/obj/effect/turf_decal/bot, /obj/effect/turf_decal/bot,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/storage) /area/science/storage)
@@ -63127,7 +63121,6 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/storage) /area/science/storage)
"cuU" = ( "cuU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 4 dir = 4
@@ -63668,12 +63661,12 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/storage) /area/science/storage)
"cvW" = ( "cvW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/effect/landmark/blobstart, /obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 4 dir = 4
}, },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/storage) /area/science/storage)
"cvX" = ( "cvX" = (
@@ -68931,13 +68924,13 @@
pixel_x = -25; pixel_x = -25;
pixel_y = -5 pixel_y = -5
}, },
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/obj/effect/turf_decal/stripes/corner{ /obj/effect/turf_decal/stripes/corner{
dir = 4 dir = 4
}, },
/obj/machinery/airalarm/unlocked{
dir = 1;
pixel_y = -22
},
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/mixing) /area/science/mixing)
"cGm" = ( "cGm" = (
@@ -117641,7 +117634,7 @@ cmQ
cok cok
cpy cpy
cqQ cqQ
cgq crR
cti cti
ctZ ctZ
cuV cuV