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

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860

Browse Source 
# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm
This commit is contained in:
deathride58
2017-11-20 23:34:46 -05:00
parent d52e405912 7e42e7cce0
commit 4e727ee576
92 changed files with 1128 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/MetaStation/MetaStation.dmm
+40 -35
View File
@@ -317,7 +317,7 @@
dir = 8;
icon_state = "diagonalWall3"
},
/area/space)
/area/security/prison)
"aaV" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_2)
@@ -327,7 +327,7 @@
dir = 1;
icon_state = "diagonalWall3"
},
/area/space)
/area/security/prison)
"aaY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -22505,7 +22505,7 @@
req_access_txt = "10"
},
/turf/open/floor/plating,
/area/engine/engineering)
/area/maintenance/starboard)
"aVh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -27482,7 +27482,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/janitor)
/area/maintenance/central)
"bfo" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34724,7 +34724,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/engine/break_room)
/area/maintenance/starboard)
"btA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
@@ -36212,7 +36212,7 @@
dir = 8
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain/private)
/area/maintenance/central)
"bwH" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -45468,7 +45468,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/gateway)
/area/maintenance/central)
"bQy" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -46700,7 +46700,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/crew_quarters/kitchen)
/area/maintenance/starboard)
"bTa" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -52046,7 +52046,7 @@
req_one_access_txt = "0"
},
/turf/open/floor/plating,
/area/hydroponics)
/area/maintenance/starboard/aft)
"cdV" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -55242,7 +55242,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/space,
/area/space)
/area/maintenance/disposal/incinerator)
"ckD" = (
/obj/machinery/doorButtons/access_button{
idDoor = "incinerator_airlock_exterior";
@@ -56225,7 +56225,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/research)
/area/maintenance/starboard/aft)
"cmN" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -58078,7 +58078,7 @@
req_access_txt = "40"
},
/turf/open/floor/plating,
/area/crew_quarters/heads/cmo)
/area/maintenance/aft)
"cqq" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -58752,7 +58752,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/medical/chemistry)
/area/maintenance/aft)
"crF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/device/radio/intercom{
@@ -59473,7 +59473,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/science/research)
/area/maintenance/aft)
"csV" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -59789,7 +59789,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/medical/genetics)
/area/maintenance/aft)
"ctD" = (
/obj/structure/sign/directions/evac,
/turf/closed/wall,
@@ -59848,7 +59848,7 @@
req_one_access_txt = "7;47;29"
},
/turf/open/floor/plating,
/area/science/misc_lab/range)
/area/maintenance/aft)
"ctN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light{
@@ -60841,7 +60841,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/science/robotics/mechbay)
/area/maintenance/aft)
"cvJ" = (
/obj/structure/sign/nosmoking_2{
pixel_x = -29
@@ -67721,7 +67721,7 @@
dir = 1
},
/turf/open/floor/plating,
/area/science/lab)
/area/maintenance/aft)
"cJn" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -78755,7 +78755,7 @@
pixel_x = 32
},
/turf/open/floor/plating,
/area/science/research)
/area/maintenance/starboard/aft)
"diI" = (
/obj/item/poster/random_contraband,
/obj/item/poster/random_contraband,
@@ -79516,7 +79516,7 @@
req_access_txt = "12"
},
/turf/open/floor/plating,
/area/crew_quarters/locker)
/area/maintenance/starboard/fore)
"dtP" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -80743,6 +80743,20 @@
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"EDx" = (
/turf/open/space,
/turf/closed/wall/mineral/plastitanium{
dir = 8;
icon_state = "diagonalWall3"
},
/area/hallway/secondary/entry)
"EDy" = (
/turf/open/space,
/turf/closed/wall/mineral/plastitanium{
dir = 1;
icon_state = "diagonalWall3"
},
/area/hallway/secondary/entry)
(1,1,1) = {"
aaa
@@ -89844,8 +89858,8 @@ aaa
aaa
aaa
aaa
aaU
blx
EDx
aRA
aRA
aRA
aRA
@@ -90872,13 +90886,8 @@ aaa
aaa
aaf
aaa
<<<<<<< HEAD
aaX
blx
=======
EDx
EDy
aRA
>>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860)
aRA
aRA
aRA
@@ -100955,7 +100964,7 @@ coE
cpZ
coB
csp
ctp
csr
duH
dyg
ceu
@@ -118598,7 +118607,7 @@ aaa
aaa
aaf
aaa
blx
acP
adl
bih
adl
@@ -118855,11 +118864,7 @@ aaa
aaa
aaf
aaa
<<<<<<< HEAD
blx
=======
EDB
>>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860)
acP
adl
aQf
adl
_maps/map_files/PubbyStation/PubbyStation.dmm
+59 -47
View File
@@ -372,7 +372,7 @@
"acF" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/turf/open/floor/plating/airless,
/area/space)
/area/ai_monitored/turret_protected/AIsatextAS)
"acG" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -35497,7 +35497,7 @@
layer = 2.9
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
/area/chapel/dock)
"bGH" = (
/obj/structure/window/reinforced,
/turf/open/space,
@@ -43480,7 +43480,7 @@
dir = 1
},
/turf/open/floor/plating/airless,
/area/space)
/area/engine/atmos)
"bZL" = (
/obj/machinery/atmospherics/pipe/simple,
/obj/structure/grille,
@@ -45191,7 +45191,7 @@
dir = 1
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
/area/maintenance/disposal/incinerator)
"ceB" = (
/obj/structure/window/reinforced/fulltile,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -47280,7 +47280,7 @@
dir = 4
},
/turf/open/floor/plating/airless,
/area/space)
/area/science/mixing)
"cly" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -51246,6 +51246,18 @@
"cCA" = (
/turf/closed/wall,
/area/science/lab)
"cCF" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 1
},
/turf/open/floor/plating/airless,
/area/maintenance/department/chapel/monastery)
"cCG" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 4
},
/turf/open/floor/plating/airless,
/area/tcommsat/computer)
(1,1,1) = {"
aaa
@@ -66344,7 +66356,7 @@ cvX
cke
cky
cld
ceA
cCF
aaa
aaa
aaa
@@ -67379,10 +67391,10 @@ cfN
cfN
cfN
aaa
cxG
cxG
cxG
cxG
aaa
aaa
aaa
aaa
cjp
cyU
cjp
@@ -67635,10 +67647,10 @@ caS
caS
caS
caS
cxF
cxF
cxF
cxF
aht
aht
aht
aht
cjp
cjp
ckH
@@ -67892,10 +67904,10 @@ cfN
caS
cfN
aaa
cxG
cxG
cxG
cxG
aaa
aaa
aaa
aaa
cjp
ckW
ckH
@@ -68149,10 +68161,10 @@ cfN
caS
caS
aht
cxF
cxF
cxF
cxF
aht
aht
aht
aht
cjp
ckW
ckH
@@ -68406,10 +68418,10 @@ cwe
cwe
cfN
aaa
cxG
cxG
cxG
cxG
aaa
aaa
aaa
aaa
cjp
cyP
ckH
@@ -69691,10 +69703,10 @@ cln
cwe
cfN
aaa
cxG
cxG
cxG
cxG
aaa
aaa
aaa
aaa
cjp
cyS
ckH
@@ -69948,10 +69960,10 @@ cln
cwe
caS
aht
cxF
cxF
cxF
cxF
aht
aht
aht
aht
cjp
cko
ckH
@@ -70205,10 +70217,10 @@ cln
cwe
cfN
cfN
cxG
cxG
cxG
cxG
aaa
aaa
aaa
aaa
cjp
cyT
ckH
@@ -70462,10 +70474,10 @@ cwe
cwe
caS
caS
cxF
cxF
cxF
cxF
aht
aht
aht
aht
cjp
cjp
ckH
@@ -70720,10 +70732,10 @@ cfN
cfN
cfN
aaa
cxG
cxG
cxG
cxF
aaa
aaa
aaa
aht
cjp
cyU
cjp
@@ -80231,7 +80243,7 @@ aaa
aaa
aaa
aaa
clx
cCG
clw
clw
clw
_maps/shuttles/emergency_airless.dmm
+537 -261
View File
@@ -3,329 +3,605 @@
/turf/open/space,
/area/space)
"b" = (
/obj/structure/shuttle/engine/propulsion{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"c" = (
/turf/closed/wall,
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/escape)
"d" = (
/obj/structure/closet/malf,
/obj/structure/window/reinforced,
/obj/structure/shuttle/engine/heater{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"e" = (
/obj/machinery/status_display,
/turf/closed/wall,
/area/shuttle/escape)
"f" = (
/obj/effect/shuttle_build,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"g" = (
/turf/open/floor/plating,
/obj/docking_port/mobile/emergency{
dwidth = 11;
height = 18;
name = "Shuttle Under Construction";
port_direction = 4;
preferred_direction = 2;
timid = 1;
width = 30
},
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"h" = (
/obj/docking_port/mobile/emergency{
name = "Shuttle Under Construction";
timid = 1
},
/obj/effect/shuttle_build,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"i" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 4;
name = "4maintenance loot spawner"
},
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"j" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"k" = (
/obj/structure/shuttle/engine/propulsion,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"l" = (
/obj/structure/closet/malf,
/obj/machinery/light/built{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"m" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 4;
name = "4maintenance loot spawner"
},
/obj/machinery/light/built{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/escape)
/turf/open/space/basic,
/area/space)
(1,1,1) = {"
a
a
a
a
a
a
b
c
e
f
f
f
f
f
f
f
f
g
b
h
b
b
b
b
a
a
a
a
a
a
f
f
f
f
f
f
f
f
f
f
e
e
a
i
i
i
a
"}
(2,1,1) = {"
a
b
c
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
b
b
b
b
b
b
b
b
b
b
b
b
b
c
c
c
a
i
i
i
a
"}
(3,1,1) = {"
b
b
d
l
d
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
j
k
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
a
i
i
i
a
"}
(4,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
j
k
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
a
i
i
i
a
"}
(5,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
j
k
c
c
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
e
f
f
e
e
"}
(6,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
j
k
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
"}
(7,1,1) = {"
b
b
b
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
j
k
"}
(8,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
j
k
c
c
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
"}
(9,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
i
m
i
b
b
j
k
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
"}
(10,1,1) = {"
a
b
b
b
b
b
b
b
b
b
b
b
b
b
b
c
e
c
b
c
a
a
d
f
f
f
f
f
f
f
f
f
f
f
f
f
h
f
f
f
f
f
f
f
f
f
f
f
f
f
"}
(11,1,1) = {"
a
a
a
a
a
a
c
c
c
c
c
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
"}
(12,1,1) = {"
b
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
"}
(13,1,1) = {"
b
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
"}
(14,1,1) = {"
c
c
a
a
a
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
e
f
f
e
e
"}
(15,1,1) = {"
b
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
a
a
a
a
a
"}
(16,1,1) = {"
b
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
a
a
a
a
a
"}
(17,1,1) = {"
b
d
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
a
a
a
a
a
"}
(18,1,1) = {"
a
c
e
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
e
e
a
a
a