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

Merge pull request #7036 from Cw3040/master

Browse Source 
Cw's dumb Map Edits v.4
This commit is contained in:
deathride58
2018-06-08 18:24:13 +00:00
committed by GitHub
parent 1fbf5af360 d5e3001261
commit ec361e26a5
3 changed files with 542 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+469 -352
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+53 -74
View File
@@ -902,6 +902,7 @@
dir = 8;
pixel_x = 24
},
/obj/machinery/cryopod,
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
"acy" = (
@@ -3638,25 +3639,6 @@
icon_state = "platingdmg1"
},
/area/maintenance/fore)
"ahU" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/table,
/obj/item/stock_parts/manipulator,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/fore)
"ahV" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
/area/crew_quarters/fitness/recreation)
"ahW" = (
/obj/structure/window/reinforced{
dir = 1
@@ -4073,22 +4055,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
"aiP" = (
/obj/structure/table,
/obj/item/folder,
/turf/open/floor/plating,
/area/maintenance/fore)
"aiQ" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
/area/crew_quarters/fitness/recreation)
"aiR" = (
/obj/structure/table,
/obj/item/clothing/under/sl_suit{
@@ -4492,7 +4458,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/turf/open/floor/plasteel/neutral/corner{
dir = 8
},
/area/crew_quarters/fitness/recreation)
"ajS" = (
/obj/structure/table,
@@ -5137,10 +5105,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
"alf" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"alg" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -5844,10 +5808,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
"amv" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plasteel/vault,
/area/crew_quarters/fitness/recreation)
"amw" = (
/obj/structure/window/reinforced,
/obj/machinery/door/window/eastright{
@@ -7795,9 +7755,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aqR" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/vending/kink,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -21761,7 +21719,7 @@
/turf/open/floor/plasteel/vault,
/area/crew_quarters/locker)
"aUR" = (
/obj/structure/closet/wardrobe/green,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/vault,
/area/crew_quarters/locker)
"aUS" = (
@@ -25567,7 +25525,7 @@
},
/area/security/checkpoint/engineering)
"bcO" = (
/obj/structure/easel,
/obj/machinery/vending/kink,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -58038,10 +57996,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cto" = (
/obj/machinery/vending/assist,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"ctq" = (
@@ -70720,6 +70675,13 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"cUd" = (
/obj/machinery/cryopod{
dir = 4;
tag = "0"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"cUH" = (
/obj/structure/table/optable,
/turf/open/floor/plasteel/white,
@@ -73591,19 +73553,12 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"dhp" = (
/obj/machinery/light{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
/turf/open/floor/plasteel/neutral/corner{
dir = 8
},
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"dhq" = (
/obj/structure/table/reinforced,
@@ -75975,6 +75930,10 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"dWa" = (
/obj/machinery/computer/cryopod,
/turf/closed/wall,
/area/security/prison)
"dYu" = (
/obj/machinery/door/airlock/external{
name = "Auxiliary Airlock"
@@ -76143,6 +76102,13 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"hdw" = (
/obj/machinery/cryopod{
dir = 4;
tag = "0"
},
/turf/open/floor/plasteel/vault,
/area/crew_quarters/fitness/recreation)
"hfJ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -76407,6 +76373,15 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
"mSt" = (
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
/area/crew_quarters/fitness/recreation)
"nnK" = (
/obj/item/stack/sheet/glass/fifty,
/obj/item/paper_bin,
@@ -76667,6 +76642,10 @@
},
/turf/open/floor/wood,
/area/library)
"rzf" = (
/obj/machinery/computer/cryopod,
/turf/closed/wall,
/area/crew_quarters/fitness/recreation)
"rzX" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -101766,7 +101745,7 @@ aax
aax
aax
aax
abe
dWa
abe
abe
abe
@@ -111540,8 +111519,8 @@ acQ
afs
agr
acP
ahU
aiP
acP
acP
acP
acP
acP
@@ -111797,12 +111776,12 @@ acP
acP
ags
acP
acP
acP
acP
alf
amv
acP
hdw
cUd
cUd
cUd
cUd
rzf
aoS
acP
arB
@@ -112053,9 +112032,9 @@ aaa
acQ
aft
agt
mSt
ahf
ahf
ahV
aiQ
dhp
alg
alg
@@ -112314,7 +112293,7 @@ ahg
ahg
ahg
ajR
ahg
ahl
ahg
anG
aoU
_maps/map_files/PubbyStation/PubbyStation.dmm
+20 -5
View File
@@ -7813,6 +7813,7 @@
dir = 4;
pixel_x = 28
},
/obj/machinery/cryopod,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avm" = (
@@ -10447,7 +10448,7 @@
/turf/open/floor/plasteel/arrival,
/area/crew_quarters/fitness/recreation)
"aBV" = (
/obj/structure/closet/wardrobe/green,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/arrival,
/area/crew_quarters/fitness/recreation)
"aBW" = (
@@ -11037,6 +11038,7 @@
/turf/open/floor/plasteel/white/side,
/area/crew_quarters/dorms)
"aDk" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/white/corner{
icon_state = "whitecorner";
dir = 8
@@ -49433,6 +49435,10 @@
},
/turf/closed/wall/r_wall,
/area/engine/engineering)
"jqN" = (
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/wood,
/area/maintenance/department/crew_quarters/dorms)
"jrG" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -52320,6 +52326,11 @@
"rHA" = (
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"rHP" = (
/obj/structure/lattice,
/obj/structure/reagent_dispensers/keg/aphro/strong,
/turf/open/space,
/area/space/nearstation)
"rJg" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/machinery/light/small{
@@ -52444,7 +52455,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"sbk" = (
/obj/structure/girder,
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"sbY" = (
@@ -54409,6 +54420,10 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"yap" = (
/obj/machinery/computer/cryopod,
/turf/closed/wall,
/area/crew_quarters/dorms)
"ybX" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
@@ -88674,7 +88689,7 @@ aaa
aaa
aaa
aby
abI
rHP
abO
abX
acg
@@ -91537,7 +91552,7 @@ cBo
alQ
alb
cBw
alb
jqN
aiS
aiS
aiS
@@ -94634,7 +94649,7 @@ aaa
aaa
apX
apX
apX
yap
avl
fIu
dbi