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

Merge pull request #10898 from EmeraldSundisk/smalltime

Browse Source 
Disposing of a problem on Delta.
This commit is contained in:
Ghom
2020-02-05 20:47:54 +01:00
committed by GitHub
parent be3694d858 8c25277913
commit c4e7f2f8cd
1 changed files with 153 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Deltastation/DeltaStation2.dmm
+153 -114
View File
@@ -35039,9 +35039,9 @@
/area/quartermaster/miningoffice)
"blX" = (
/obj/machinery/disposal/bin,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light,
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"blY" = (
@@ -35915,7 +35915,6 @@
/area/quartermaster/miningoffice)
"bnA" = (
/obj/structure/plasticflaps/opaque,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/northright{
req_access_txt = "48"
@@ -35923,7 +35922,6 @@
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"bnB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -36748,6 +36746,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"boW" = (
@@ -36760,6 +36761,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"boX" = (
@@ -36767,7 +36771,6 @@
name = "Maintenance Hatch";
req_access_txt = "12"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -36780,10 +36783,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"boY" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -36796,11 +36801,13 @@
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"boZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-8"
},
@@ -36808,18 +36815,17 @@
dir = 9
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"bpa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/effect/turf_decal/tile/brown{
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"bpa" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"bpb" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt,
@@ -38203,6 +38209,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"brb" = (
@@ -39341,12 +39348,12 @@
/area/hallway/primary/central)
"bsV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment{
dir = 10
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 10
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bsW" = (
@@ -85386,10 +85393,6 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/central)
"cNB" = (
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/medical/medbay/central)
"cNC" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -125766,17 +125769,6 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
"eYg" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"faI" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -125813,6 +125805,27 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/central)
"fiK" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/disposalpipe/sorting/mail{
dir = 8;
name = "Mining Junction";
sortType = 22
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"fno" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -125935,15 +125948,6 @@
},
/turf/open/floor/engine,
/area/science/mixing)
"gdb" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"giN" = (
/obj/structure/window/reinforced{
dir = 8
@@ -125955,19 +125959,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/science/circuit)
"gmn" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"gut" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -126102,11 +126093,6 @@
/obj/structure/sign/warning/vacuum,
/turf/closed/wall/r_wall,
/area/chapel/office)
"hlu" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"hrP" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -126387,6 +126373,10 @@
},
/turf/open/floor/plasteel,
/area/medical/morgue)
"jOB" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/maintenance/starboard/fore)
"jOE" = (
/obj/machinery/newscaster{
pixel_x = 32
@@ -126585,6 +126575,17 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/medbay/central)
"lDl" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/effect/turf_decal/tile/brown,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"lEl" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -126700,23 +126701,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"mgh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"mkm" = (
/obj/machinery/atmospherics/components/binary/valve,
/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
@@ -126767,6 +126751,15 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
"mvx" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"mxm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/circuit/green,
@@ -126776,6 +126769,17 @@
/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"mLI" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"mPj" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -126838,10 +126842,28 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/maintenance/port/fore)
"nQR" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"nSh" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"nSS" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"oHk" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -127063,6 +127085,21 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
"qeN" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"qhc" = (
/obj/structure/table/reinforced,
/obj/item/integrated_electronics/analyzer,
@@ -127458,6 +127495,17 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"xdp" = (
/obj/docking_port/stationary{
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"xdZ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -127510,17 +127558,23 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
"xDY" = (
/obj/docking_port/stationary{
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
"xCB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/space/basic,
/area/space)
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"xDZ" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -127608,21 +127662,6 @@
},
/turf/open/floor/plating,
/area/science/research/abandoned)
"ylW" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
(1,1,1) = {"
aaa
@@ -137517,7 +137556,7 @@ bPC
bRK
bTC
bVK
ylW
qeN
cal
bPC
aaa
@@ -137774,7 +137813,7 @@ bPC
bRL
bTC
bVx
mgh
xCB
cam
bPC
bRO
@@ -138031,7 +138070,7 @@ bPC
bRM
bTD
bVL
mgh
xCB
can
bPC
bkE
@@ -160040,10 +160079,10 @@ aaa
aaa
aaa
aaa
xDY
eYg
gdb
gmn
xdp
mLI
mvx
nSS
abe
abp
abC
@@ -160301,7 +160340,7 @@ aaa
aaO
aaO
aaO
hlu
nQR
abq
abD
abD
@@ -168897,7 +168936,7 @@ cHP
cIS
bqX
cMa
cNB
iQI
cPr
cQW
cSF
@@ -171166,7 +171205,7 @@ blS
baQ
boV
bra
bsU
fiK
bus
bvM
bwZ
@@ -172449,7 +172488,7 @@ bio
bjZ
blW
aig
aiC
lDl
aig
aad
but
@@ -172706,7 +172745,7 @@ bip
bka
baQ
aig
apw
auv
aig
aaa
but
@@ -172962,7 +173001,7 @@ bgP
biq
bjZ
blX
aig
jOB
bpa
aig
aaa