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

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

Browse Source
This commit is contained in:
Poojawa
2019-10-16 01:51:51 -05:00
parent dad9f7f6ce 9775c6162d
commit 184e81eec0
61 changed files with 1059 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+15 -9
View File
@@ -5898,6 +5898,15 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"alN" = (
/obj/machinery/camera{
c_tag = "Dormitory Toilets";
dir = 1
},
/obj/structure/table,
/obj/structure/bedsheetbin/towel,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"alO" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -15668,13 +15677,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aJz" = (
/obj/machinery/camera{
c_tag = "Dormitory Toilets";
dir = 1
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"aJA" = (
/obj/machinery/door/airlock/maintenance{
name = "Kitchen Maintenance";
@@ -57422,6 +57424,10 @@
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"moD" = (
/obj/effect/landmark/barthpot,
/turf/open/floor/wood,
/area/library)
"mpI" = (
/obj/structure/table/wood,
/turf/open/floor/wood{
@@ -90144,7 +90150,7 @@ aDL
aFf
aGk
aHU
aJz
alN
aAh
aLQ
aJq
@@ -102489,7 +102495,7 @@ aQq
aRP
aIt
aIt
aIt
moD
aWd
aXV
aIt
_maps/map_files/Deltastation/DeltaStation2.dmm
+37 -31
View File
@@ -124,6 +124,36 @@
},
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"aaq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/table,
/obj/structure/bedsheetbin/towel,
/turf/open/floor/plasteel,
/area/crew_quarters/toilet/restrooms)
"aar" = (
/obj/structure/table,
/obj/machinery/light{
dir = 8
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/structure/bedsheetbin/color,
/turf/open/floor/plasteel/white/corner{
dir = 1
},
/area/crew_quarters/dorms)
"aas" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland1";
@@ -80845,21 +80875,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/toilet/restrooms)
"cFc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/toilet/restrooms)
"cFd" = (
/obj/machinery/shower{
dir = 8;
@@ -84352,19 +84367,6 @@
/obj/item/reagent_containers/dropper,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cKT" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
/obj/machinery/light{
dir = 8
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/turf/open/floor/plasteel/white/corner{
dir = 1
},
/area/crew_quarters/dorms)
"cKU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -127152,6 +127154,10 @@
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
"kZu" = (
/obj/effect/landmark/barthpot,
/turf/open/floor/wood,
/area/library)
"lak" = (
/turf/open/floor/plasteel/white/side{
dir = 10
@@ -160651,7 +160657,7 @@ caG
chU
cjt
ckR
cmt
kZu
cnR
cpv
cqQ
@@ -172742,7 +172748,7 @@ bsE
cAm
cBI
cDo
cFc
aaq
cAm
cHW
cIW
@@ -177115,7 +177121,7 @@ cFr
cGP
cqd
cJe
cKT
aar
cMq
cAw
cPM
_maps/map_files/MetaStation/MetaStation.dmm
+13 -10
View File
@@ -2,6 +2,17 @@
"aaa" = (
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/structure/sign/poster/official/random{
pixel_y = -32
},
/obj/structure/table,
/obj/structure/bedsheetbin/towel,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"aac" = (
/obj/effect/landmark/carpspawn,
/turf/open/space,
@@ -43777,6 +43788,7 @@
/turf/open/floor/wood,
/area/library)
"bGt" = (
/obj/effect/landmark/barthpot,
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
@@ -80881,15 +80893,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"dhD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/structure/sign/poster/official/random{
pixel_y = -32
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"dhE" = (
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
@@ -118786,7 +118789,7 @@ aBu
aCB
aDU
aFg
dhD
aab
axC
axC
axC
_maps/map_files/OmegaStation/OmegaStation.dmm
+15 -15
View File
@@ -955,6 +955,19 @@
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"abn" = (
/obj/structure/table,
/obj/machinery/camera{
c_tag = "Locker Room East";
dir = 8
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/structure/bedsheetbin/color,
/turf/open/floor/plasteel/white/corner,
/area/crew_quarters/dorms)
"abo" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -15282,19 +15295,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aAJ" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
/obj/machinery/camera{
c_tag = "Locker Room East";
dir = 8
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/turf/open/floor/plasteel/white/corner,
/area/crew_quarters/dorms)
"aAK" = (
/obj/structure/sign/poster/random,
/turf/closed/wall,
@@ -26273,7 +26273,7 @@
/turf/open/floor/wood,
/area/library)
"aUZ" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/landmark/barthpot,
/turf/open/floor/wood,
/area/library)
"aVa" = (
@@ -82332,7 +82332,7 @@ awQ
axK
ayC
awQ
aAJ
abn
aBT
awQ
aDI
_maps/map_files/PubbyStation/PubbyStation.dmm
+34 -28
View File
@@ -2,6 +2,33 @@
"aaa" = (
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/machinery/newscaster{
pixel_x = 32
},
/obj/structure/cable{
icon_state = "1-8"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/structure/bedsheetbin/color,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/dorms)
"aac" = (
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/structure/table,
/obj/structure/bedsheetbin/towel,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"aad" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{
@@ -7254,22 +7281,6 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/dorms)
"asg" = (
/obj/structure/bedsheetbin,
/obj/machinery/newscaster{
pixel_x = 32
},
/obj/structure/cable{
icon_state = "1-8"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/dorms)
"ash" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -14880,15 +14891,6 @@
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"aJo" = (
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"aJp" = (
/obj/item/chair,
/turf/open/floor/plating,
@@ -60875,6 +60877,10 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"vkd" = (
/obj/effect/landmark/barthpot,
/turf/open/floor/carpet,
/area/library/lounge)
"vlF" = (
/obj/item/coin/silver,
/obj/effect/decal/cleanable/oil{
@@ -79871,7 +79877,7 @@ ckT
xhj
xhj
cwK
xhj
vkd
xhj
cxn
xhj
@@ -100836,7 +100842,7 @@ aiT
aiS
apX
cod
asg
aab
atj
apX
avi
@@ -102395,7 +102401,7 @@ aFH
aGG
aHo
aIk
aJo
aac
aGF
aEd
aMr