shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12916 from MrJWhit/meta-station-atmos-and-toxins-update

Browse Source 
Metastation atmos and toxins map update
This commit is contained in:
silicons
2020-07-26 22:57:36 -07:00
committed by GitHub
parent 911761de17 d14256e8a9
commit d9f9b2e974
1 changed files with 77 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/MetaStation/MetaStation.dmm
+77 -86
View File
@@ -39225,7 +39225,7 @@
dir = 4
},
/obj/machinery/computer/station_alert,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark/corner{
@@ -39245,7 +39245,7 @@
dir = 4
},
/obj/structure/closet/secure_closet/atmospherics,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark/corner{
@@ -39262,10 +39262,10 @@
dir = 4
},
/obj/structure/closet/secure_closet/atmospherics,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
@@ -39278,9 +39278,6 @@
pixel_y = 24
},
/obj/machinery/computer/atmos_control,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/turf/open/floor/plasteel/checker,
/area/engine/atmos)
"byW" = (
@@ -39294,7 +39291,7 @@
dir = 4
},
/obj/machinery/computer/atmos_control,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel/checker,
@@ -39313,12 +39310,12 @@
pixel_x = -26
},
/obj/machinery/pipedispenser/disposal/transit_tube,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"byY" = (
@@ -39326,7 +39323,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel,
@@ -39339,14 +39336,14 @@
dir = 8
},
/obj/machinery/pipedispenser,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Atmospherics - Entrance";
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bza" = (
@@ -42605,7 +42602,7 @@
name = "Distribution Loop";
req_access_txt = "24"
},
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bFQ" = (
@@ -44666,19 +44663,19 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKy" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/closed/wall,
/area/engine/atmos)
"bKz" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 10
},
/turf/closed/wall,
/area/engine/atmos)
"bKA" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall,
/area/engine/atmos)
"bKB" = (
@@ -45401,7 +45398,7 @@
/area/engine/atmos)
"bMe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plating,
/area/engine/atmos)
"bMf" = (
@@ -64903,10 +64900,8 @@
/obj/machinery/light_switch{
pixel_y = 28
},
/obj/structure/closet/l3closet/scientist{
pixel_x = -2
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/closet/bombcloset,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyA" = (
@@ -64937,7 +64932,6 @@
"cyD" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyE" = (
@@ -64949,7 +64943,6 @@
network = list("ss13","rd")
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/canister,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
@@ -64982,7 +64975,9 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/plasteel,
/area/science/mixing)
"cyI" = (
@@ -64998,11 +64993,7 @@
/obj/machinery/light_switch{
pixel_y = 28
},
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"cyK" = (
/turf/closed/wall/r_wall,
@@ -65413,10 +65404,14 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"czB" = (
/obj/machinery/portable_atmospherics/pump,
/obj/effect/turf_decal/stripes/line{
dir = 8
/obj/machinery/light{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 2
},
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plasteel,
/area/science/mixing)
"czC" = (
@@ -66094,12 +66089,15 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"cAG" = (
/obj/structure/window/reinforced,
/obj/machinery/portable_atmospherics/scrubber,
/obj/item/storage/firstaid/toxin,
/obj/effect/turf_decal/stripes/line{
dir = 10
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
/obj/machinery/camera{
c_tag = "Toxins - Mixing Area";
dir = 8;
network = list("ss13","rd")
},
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plasteel,
/area/science/mixing)
"cAH" = (
@@ -66814,10 +66812,10 @@
/turf/open/floor/plasteel/white,
/area/science/research)
"cCt" = (
/obj/structure/closet/bombcloset,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/science/mixing)
"cCu" = (
@@ -67974,19 +67972,14 @@
dir = 1;
pixel_y = 2
},
/obj/machinery/light{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/turf/open/floor/plasteel,
/area/science/mixing)
"cEz" = (
/obj/structure/closet/wardrobe/grey,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
/obj/machinery/portable_atmospherics/scrubber,
/obj/item/storage/firstaid/toxin,
/turf/open/floor/plasteel,
/area/science/mixing)
"cEA" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -68371,18 +68364,7 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"cFs" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Toxins - Mixing Area";
dir = 8;
network = list("ss13","rd")
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/mixing)
"cFu" = (
@@ -68868,9 +68850,6 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plasteel,
/area/science/mixing)
@@ -70101,9 +70080,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cIm" = (
@@ -79544,15 +79521,15 @@
},
/area/medical/medbay/aft)
"diP" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"diQ" = (
@@ -80266,9 +80243,7 @@
pixel_y = -24
},
/obj/structure/cable/yellow,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dAh" = (
@@ -81343,6 +81318,13 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"gGH" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"gGT" = (
/obj/effect/landmark/start/scientist,
/obj/structure/chair/office/light{
@@ -82261,6 +82243,15 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
"pVL" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"pZb" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -117137,16 +117128,16 @@ cvX
cwY
crR
cyJ
czB
cAG
cBs
cBs
cBB
cCC
cDp
czB
cAG
cEz
cyK
cyK
cyK
cyK
cPe
dxQ
dvY
cJY
cKM
@@ -117400,9 +117391,9 @@ cBC
cyK
cyK
cyK
dvY
dyc
cub
cyK
cyK
cyK
diP
dvY
cJZ
@@ -117658,9 +117649,9 @@ cCD
uun
rSL
dvY
cEz
dxQ
dyc
gGH
pVL
dvY
cKa
cKO