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

Merge remote-tracking branch 'upstream/master' into snaxi2

Browse Source
This commit is contained in:
Detective Google
2020-05-08 01:13:12 -05:00
parent 504b1762f4 43dc1319d9
commit 4e84b92e2e
203 changed files with 2188 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
+3 -11
View File
@@ -35,10 +35,6 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/cult,
/area/ruin/unpowered/buried_library)
"aj" = (
/obj/structure/bookcase/random,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_library)
"ak" = (
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
@@ -100,10 +96,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/unpowered/buried_library)
"aB" = (
/obj/structure/girder,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_library)
"aC" = (
/obj/item/feather,
/turf/closed/mineral/random/snow/no_caves,
@@ -674,7 +666,7 @@ ah
ak
ah
bh
aj
ah
az
ah
ak
@@ -695,7 +687,7 @@ ai
ar
al
bc
aj
ah
aL
ah
aA
@@ -777,7 +769,7 @@ ac
ba
ac
ac
aB
br
ad
aa
ad
_maps/icebox.json
+4 -2
View File
@@ -18,7 +18,8 @@
"traits":[
{
"Up":1,
"Mining":true,
"Mining":true,
"Station":false,
"Linkage":null,
"Gravity":true,
"Ice Ruins Underground":true,
@@ -27,7 +28,8 @@
{
"Down":-1,
"Up":1,
"Mining":true,
"Mining":true,
"Station":false,
"Linkage":null,
"Gravity":true,
"Ice Ruins Underground":true,
_maps/map_files/BoxStation/BoxStation.dmm
+65 -55
View File
@@ -3098,7 +3098,9 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"agd" = (
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"age" = (
@@ -6473,16 +6475,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"alX" = (
/obj/machinery/button/door{
id = "atmos";
name = "Atmospherics Lockdown";
pixel_x = 24;
pixel_y = 4;
req_access_txt = "24"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"alY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -39435,7 +39427,10 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPe" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Pure to Ports"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPf" = (
@@ -39453,10 +39448,10 @@
/area/engine/atmos)
"bPh" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"bPi" = (
@@ -40719,7 +40714,9 @@
/area/engine/atmos)
"bSM" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/turf/open/floor/plating,
/area/engine/atmos)
"bSP" = (
@@ -41475,13 +41472,16 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUN" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUO" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Ports to External"
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -41912,8 +41912,9 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bVZ" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Ports to External"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -46658,8 +46659,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"ciu" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating,
/area/engine/atmos)
"civ" = (
@@ -53524,8 +53525,9 @@
/turf/open/floor/plasteel,
/area/security/brig)
"daq" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"daI" = (
@@ -53947,9 +53949,7 @@
/turf/open/floor/plating,
/area/security/prison)
"eqq" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/orange/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"eqA" = (
@@ -55364,7 +55364,7 @@
"ivJ" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/purple/visible{
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
/turf/open/floor/plating,
@@ -55417,7 +55417,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating,
/area/engine/atmos)
"iLJ" = (
@@ -55708,11 +55708,7 @@
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
"jBQ" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Pure to Ports"
},
/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"jCq" = (
@@ -56728,6 +56724,10 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"moS" = (
/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"mps" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -57773,7 +57773,9 @@
/area/crew_quarters/fitness)
"pCj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 5
},
/turf/open/floor/plating,
/area/engine/atmos)
"pDe" = (
@@ -57915,10 +57917,11 @@
/turf/open/floor/plasteel,
/area/security/processing)
"pUP" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 5
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/turf/open/floor/plasteel,
/turf/open/floor/plating,
/area/engine/atmos)
"qaY" = (
/obj/structure/table/reinforced,
@@ -58469,6 +58472,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/fore)
"rTo" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "External to Pumps"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"rTu" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -60034,18 +60044,18 @@
/turf/open/floor/plasteel/white,
/area/science/circuit)
"vPQ" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "External to Pumps"
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 10
},
/turf/open/floor/plasteel,
/turf/open/floor/plating,
/area/engine/atmos)
"vQf" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/components/binary/pump/on{
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Mix to External"
},
@@ -93433,7 +93443,7 @@ bQp
alk
gAu
eqq
pUP
bOd
bOd
bOd
bOd
@@ -93689,8 +93699,8 @@ bJF
bVX
bRA
bTP
rTo
bOd
vPQ
bOd
bOd
bOd
@@ -93947,7 +93957,7 @@ bMQ
bRC
rdl
daq
bUN
bUO
bOd
bOd
bOd
@@ -94204,7 +94214,7 @@ cBF
bRD
rdl
daq
bUN
bUO
bOd
bOd
bOd
@@ -94460,7 +94470,7 @@ bPc
bQs
cez
ceA
bOd
daq
bUO
bOd
bOd
@@ -94718,7 +94728,7 @@ bQv
bRF
bSM
bVZ
bUN
bOd
bOd
bOd
bOd
@@ -94973,7 +94983,7 @@ bOc
udT
omk
nTU
bSM
pUP
jBQ
agd
cCB
@@ -95487,8 +95497,8 @@ oVN
bPf
bQx
bRH
bMQ
bTU
vPQ
moS
kGv
bUS
cCE
@@ -96002,15 +96012,15 @@ ivJ
bQy
bRI
bSP
bPh
ivJ
jzM
bRI
cCF
bPh
ivJ
bQy
bRI
bQy
bPh
ivJ
bQy
bRI
bSP
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+258 -199
View File
@@ -716,8 +716,15 @@
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
/area/icemoon/surface/outdoors)
"abY" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/icemoon/surface/outdoors)
/area/engine/engineering)
"aca" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -9185,7 +9192,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 1
},
/turf/open/floor/plating/airless,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/science/xenobiology)
"asD" = (
/obj/structure/table/wood,
@@ -9395,7 +9402,7 @@
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"atp" = (
/obj/machinery/door/airlock/external{
@@ -9821,7 +9828,7 @@
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
},
/turf/closed/mineral/random/snow/no_caves,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"auB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -10103,7 +10110,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"avn" = (
/obj/machinery/door/airlock{
@@ -10166,7 +10173,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 10
},
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"avv" = (
/obj/machinery/camera{
@@ -10196,7 +10203,7 @@
/area/maintenance/fore/secondary)
"avx" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"avy" = (
/obj/machinery/door/airlock{
@@ -10242,7 +10249,7 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"avC" = (
/obj/structure/chair{
@@ -10458,14 +10465,14 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 10
},
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"awe" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"awg" = (
/obj/structure/cable{
@@ -10611,7 +10618,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"awt" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
@@ -10656,7 +10663,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 5
},
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"awx" = (
/obj/structure/cable{
@@ -10829,7 +10836,7 @@
/area/maintenance/starboard/fore)
"awN" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plating,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"awO" = (
/obj/structure/cable{
@@ -48519,9 +48526,6 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"cmU" = (
@@ -53144,6 +53148,18 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
"cQU" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"cSA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -55341,19 +55357,15 @@
/turf/open/floor/carpet,
/area/library)
"hsZ" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
icon_state = "2-8"
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/turf/open/floor/plating,
/area/engine/engineering)
"hzK" = (
/turf/open/floor/plasteel/yellowsiding/corner{
@@ -55373,6 +55385,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"hBw" = (
@@ -55497,6 +55512,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"hSl" = (
@@ -56689,12 +56710,13 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"kZE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"kZS" = (
@@ -58198,6 +58220,9 @@
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"plS" = (
@@ -59313,6 +59338,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"spz" = (
@@ -59452,6 +59480,18 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"sCS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"sEi" = (
/obj/machinery/vr_sleeper{
dir = 4
@@ -59643,15 +59683,18 @@
/turf/closed/wall,
/area/engine/atmos)
"sVb" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"sWR" = (
@@ -60626,6 +60669,18 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/locker)
"viD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/turf/open/floor/engine,
/area/engine/engineering)
"viF" = (
/obj/structure/table/wood,
/obj/item/instrument/trumpet,
@@ -61108,6 +61163,10 @@
/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/maintenance/bar)
"wgZ" = (
/obj/structure/cable,
/turf/open/floor/plasteel,
/area/engine/engineering)
"wig" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -70287,11 +70346,11 @@ crk
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
aBM
aBM
aBM
@@ -70544,11 +70603,11 @@ asE
arB
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
aBM
aBM
arB
@@ -70801,11 +70860,11 @@ cwT
aAC
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
aBM
aBM
aAC
@@ -71057,13 +71116,13 @@ iEJ
asE
arB
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
crk
aBM
arB
asE
@@ -71315,11 +71374,11 @@ awW
aAD
awW
crk
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
awW
awW
@@ -71572,11 +71631,11 @@ azy
auP
cIh
crk
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
azy
auP
@@ -71829,11 +71888,11 @@ awW
awW
awW
crk
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
awW
awW
@@ -72085,13 +72144,13 @@ cqr
azz
aAF
awW
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
crk
awW
aOf
azz
@@ -72342,13 +72401,13 @@ aIK
ayl
aAE
awW
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
crk
awW
aOe
ayl
@@ -72599,13 +72658,13 @@ aIK
ayl
aAH
awW
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
crk
awW
aOh
ayl
@@ -72856,13 +72915,13 @@ cry
azA
aAG
awW
aBM
aBM
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
crk
awW
aOg
azA
@@ -73114,11 +73173,11 @@ awW
awW
awW
crk
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
awW
awW
@@ -73371,11 +73430,11 @@ azy
auP
cIh
crk
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
azy
auP
@@ -73628,11 +73687,11 @@ awW
aAD
awW
crk
aBM
aBM
aBM
aBM
aBM
crk
crk
crk
crk
crk
crk
awW
awW
@@ -73884,13 +73943,13 @@ ayo
azB
awW
aBM
aBM
aBM
aBM
crk
crk
crk
auA
aBM
aBM
aBM
crk
crk
crk
aBM
awW
aPt
@@ -74684,8 +74743,8 @@ aBM
aBM
aBM
aBM
wWu
wWu
aBM
aBM
aBM
aBM
aBM
@@ -74940,10 +74999,10 @@ beO
beO
beO
beO
wWu
wWu
wWu
wWu
aBM
aBM
aBM
aBM
aBM
aBM
aBM
@@ -76228,7 +76287,7 @@ beO
wWu
wWu
wWu
aBM
wWu
aBM
aBM
aBM
@@ -76484,7 +76543,7 @@ cAJ
beO
wWu
wWu
aBM
wWu
aBM
aBM
aBM
@@ -76739,8 +76798,8 @@ bjf
beO
beO
beO
aBM
aBM
wWu
wWu
aBM
aBM
aBM
@@ -81068,7 +81127,7 @@ alU
alU
amC
alU
ats
crk
rJw
arO
amC
@@ -81844,7 +81903,7 @@ alU
ayF
ayF
ayF
ats
crk
avY
axo
arP
@@ -83115,15 +83174,15 @@ ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
crk
crk
crk
crk
crk
crk
crk
crk
crk
arP
vqP
inw
@@ -83372,15 +83431,15 @@ ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
crk
crk
crk
crk
crk
crk
crk
crk
crk
aqQ
uCo
gzY
@@ -83629,15 +83688,15 @@ ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
crk
crk
crk
crk
crk
crk
crk
crk
crk
aqQ
aqR
aqR
@@ -83886,15 +83945,15 @@ ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
crk
crk
crk
crk
crk
crk
crk
crk
crk
aqQ
uCo
gzY
@@ -84143,15 +84202,15 @@ ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
ayF
crk
crk
crk
crk
crk
crk
ato
ayF
ayF
crk
crk
arP
aqR
aqR
@@ -88609,7 +88668,7 @@ cmG
cnt
cob
coL
cgR
wgZ
cgR
thz
mZO
@@ -88865,7 +88924,7 @@ cTc
cTe
cfG
cgw
uvd
abY
fkR
uvd
ccw
@@ -89122,7 +89181,7 @@ clJ
cmF
cgR
cgI
sYC
hsZ
eon
bHg
bHg
@@ -89636,7 +89695,7 @@ cTd
ckF
ckF
qiK
oZv
cQU
wKZ
uut
cVt
@@ -90661,9 +90720,9 @@ cjf
cSX
ckK
clJ
hsZ
ckH
jrl
cmL
cgR
fkR
sVb
lIY
oYj
@@ -90921,7 +90980,7 @@ clJ
cmL
cnv
uvd
oxl
sCS
wKZ
sPm
rOg
@@ -91176,9 +91235,9 @@ cfb
cfb
ccw
cmN
ckH
jrl
sVb
cgR
fkR
viD
lIY
nRl
mKq
@@ -97318,13 +97377,13 @@ bvd
bKH
bzs
avm
abY
ayF
avm
abY
ayF
avB
abY
ayF
avm
abY
ayF
avB
awd
awe
@@ -97592,7 +97651,7 @@ bPj
bQA
bPj
bOh
abY
ayF
bMK
cyG
bMK
@@ -97849,7 +97908,7 @@ cbI
ccC
cdD
bOh
abY
ayF
bMQ
cyG
bMK
@@ -98106,7 +98165,7 @@ cbH
ccB
cbH
bOh
abY
ayF
bMQ
cyG
cKT
@@ -98363,7 +98422,7 @@ cbH
ccD
cbH
bOh
abY
ayF
bMQ
cyG
bMK
@@ -98620,7 +98679,7 @@ bOh
bOh
bOh
bOh
abY
ayF
bMK
axm
sUh
@@ -98873,11 +98932,11 @@ avx
avx
avx
aww
abY
abY
abY
abY
abY
ayF
ayF
ayF
ayF
ayF
cfj
cfU
cfj
_maps/map_files/MetaStation/MetaStation.dmm
+179 -69
View File
@@ -39336,6 +39336,9 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"byY" = (
@@ -40124,6 +40127,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/machinery/light/small,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bAI" = (
@@ -41633,7 +41637,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/closed/wall/r_wall,
/turf/closed/wall,
/area/engine/atmos)
"bDS" = (
/obj/effect/turf_decal/tile/yellow{
@@ -42650,7 +42654,7 @@
/area/engine/atmos)
"bFI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
/turf/closed/wall/r_wall,
/area/engine/atmos)
"bFJ" = (
/obj/structure/disposalpipe/segment{
@@ -42659,7 +42663,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plasteel/dark/corner,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bFM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -42702,15 +42706,13 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bFR" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 6
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/turf/closed/wall,
/area/engine/atmos)
"bFS" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bFT" = (
@@ -43345,9 +43347,8 @@
/area/engine/atmos)
"bHx" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 1
},
/turf/open/floor/plating,
/area/engine/atmos)
@@ -44017,7 +44018,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/turf/closed/wall/r_wall,
/turf/closed/wall,
/area/engine/atmos)
"bIP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
@@ -44047,27 +44048,29 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bIT" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 4
},
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 9
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bIU" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/obj/machinery/meter,
/obj/machinery/atmospherics/components/binary/pump{
name = "Air to Ports"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bIV" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 6
/obj/machinery/atmospherics/components/binary/pump{
name = "Mix to Ports"
},
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bIW" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
/turf/open/floor/plasteel,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/closed/wall,
/area/engine/atmos)
"bIX" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
@@ -44786,8 +44789,12 @@
/turf/open/floor/plasteel,
/area/storage/tcom)
"bKu" = (
/obj/effect/turf_decal/bot,
/turf/closed/wall/r_wall,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/plating,
/area/engine/atmos)
"bKw" = (
/obj/structure/cable/yellow{
@@ -44800,7 +44807,7 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/turf/closed/wall/r_wall,
/turf/closed/wall,
/area/engine/atmos)
"bKz" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
@@ -44830,7 +44837,9 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKE" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKF" = (
@@ -45559,9 +45568,9 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
},
/obj/machinery/atmospherics/components/binary/pump/on{
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
name = "Mix to External"
name = "Port to External"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -45569,7 +45578,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
/turf/closed/wall/r_wall,
/turf/closed/wall,
/area/engine/atmos)
"bMh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -46436,7 +46445,12 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 6
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bNR" = (
@@ -47128,6 +47142,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/dark/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPr" = (
@@ -50108,7 +50123,9 @@
},
/area/engine/atmos)
"bVI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 9
},
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
@@ -50860,6 +50877,9 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 9
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"bXq" = (
@@ -53689,9 +53709,7 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
/obj/machinery/atmospherics/components/binary/pump{
name = "Mix to Fuel Pipe"
},
/obj/machinery/atmospherics/pipe/simple/dark/visible,
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"ccP" = (
@@ -78788,11 +78806,10 @@
name = "Inner Pipe Access";
req_access_txt = "24"
},
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
name = "Mix to Engine"
},
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"dhj" = (
@@ -81294,6 +81311,15 @@
},
/turf/open/floor/plating,
/area/quartermaster/storage)
"dLd" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 8
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"dLK" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -81536,6 +81562,12 @@
/obj/item/integrated_circuit_printer,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"gRX" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"gXY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -81605,6 +81637,13 @@
},
/turf/open/floor/plasteel/white,
/area/science/lab)
"izM" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Pure to Ports"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"iCn" = (
/obj/machinery/vr_sleeper,
/turf/open/floor/plasteel,
@@ -81613,6 +81652,13 @@
/obj/structure/table,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"iRL" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 0;
name = "Mix to Engine"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"iSt" = (
/obj/machinery/door/airlock/grunge,
/obj/structure/cable/yellow{
@@ -81677,6 +81723,15 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"jAj" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 6
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"jBe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -82064,6 +82119,12 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"nBn" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"nIb" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
@@ -82143,6 +82204,13 @@
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"oms" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/atmos)
"omz" = (
/obj/machinery/status_display/supply,
/turf/closed/wall,
@@ -82218,6 +82286,13 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"pbF" = (
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"pmc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -82403,6 +82478,12 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"rpR" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 5
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"rzX" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -82416,6 +82497,12 @@
},
/turf/open/floor/plasteel/white,
/area/science/lab)
"rAc" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"rLV" = (
/obj/structure/table,
/obj/item/folder,
@@ -82483,6 +82570,13 @@
/obj/structure/grille,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"siI" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
name = "Port to Filter"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"soe" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -82501,6 +82595,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"stP" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "Port to Fuel Pipe"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"syk" = (
/obj/machinery/door/airlock{
id_tag = "AuxShower";
@@ -82649,6 +82749,10 @@
/obj/machinery/cryopod,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/cryopod)
"uku" = (
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"upN" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -82867,6 +82971,12 @@
/obj/machinery/vending/cola/random,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"xgC" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 9
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"xkG" = (
/obj/item/integrated_electronics/wirer,
/obj/structure/table/reinforced,
@@ -122977,7 +123087,7 @@ bpg
brA
bep
bvd
bxd
bxc
byR
bAB
bCh
@@ -123234,7 +123344,7 @@ bpg
brB
bep
bve
bxd
bxc
byS
bAC
dBJ
@@ -123491,7 +123601,7 @@ bpg
brC
bep
bCK
bxd
bxc
byT
bAD
bCj
@@ -124005,7 +124115,7 @@ bpi
brE
btz
bvh
bxd
bxc
byV
bAF
bCk
@@ -124013,7 +124123,7 @@ dBJ
bFH
bHq
bCk
bKu
bxd
bxc
bxc
bxc
@@ -124522,10 +124632,10 @@ bep
bxc
bKy
bAG
bxg
bFR
dBM
bza
bxl
bIW
bIO
bMg
bMb
@@ -124536,8 +124646,8 @@ bSg
bDS
bDS
bVI
dBJ
bCi
jAj
bYw
bYw
cbe
ccO
@@ -124784,7 +124894,7 @@ bDT
bFM
bHu
bIP
bKw
dLd
bKw
bNQ
bPq
@@ -125041,9 +125151,9 @@ bDU
bFN
bAO
bIS
siI
bCi
bCi
bCi
rAc
bCi
bCi
bCi
@@ -125298,9 +125408,9 @@ bDV
bFO
bHv
bIR
bCi
bCi
bCi
nBn
stP
xgC
bCi
bCi
bCi
@@ -125555,8 +125665,8 @@ bMe
bFP
bMe
bMf
bCi
bCi
uku
pbF
bCi
bCi
bCi
@@ -125812,8 +125922,8 @@ bDW
bFQ
bHw
bIT
bCi
bCi
oms
pbF
bCi
bCi
bCi
@@ -126066,11 +126176,11 @@ bzc
bAL
ddF
bDX
bFR
bCi
bHx
bIU
bCi
bCi
uku
pbF
bCi
bCi
bKD
@@ -126324,11 +126434,11 @@ bAM
bCt
bDY
bFS
bHy
bKu
bIV
bCi
bCi
bCi
uku
iRL
rpR
bCi
bCi
bCi
@@ -126582,10 +126692,10 @@ bCu
bDZ
bFT
bHz
bIW
bNR
izM
bKD
bCi
bCi
gRX
bCi
bCi
bCi
@@ -126842,7 +126952,7 @@ bHy
bIX
bKE
bNR
bCi
gRX
bCi
bCi
bCi