Merge pull request #11762 from Kraseo/whoopsie

hey guess who forgot about kilo's public mining shuttle dock
This commit is contained in:
Ghom
2020-04-12 06:29:05 +02:00
committed by GitHub
+305 -123
View File
@@ -19002,7 +19002,7 @@
"aEK" = (
/obj/structure/sign/poster/contraband/random,
/turf/closed/wall/rust,
/area/hallway/secondary/entry)
/area/security/vacantoffice)
"aEL" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -21544,6 +21544,9 @@
pixel_x = -26
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"aIZ" = (
@@ -62405,7 +62408,7 @@
name = "EMERGENCY STORAGE"
},
/turf/closed/wall,
/area/hallway/secondary/entry)
/area/security/vacantoffice)
"bSM" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
@@ -62669,6 +62672,9 @@
pixel_x = -23
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"bTf" = (
@@ -62869,17 +62875,23 @@
/turf/closed/wall/rust,
/area/hallway/secondary/exit/departure_lounge)
"bTy" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"bTz" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral,
@@ -62934,6 +62946,9 @@
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTE" = (
@@ -63096,6 +63111,9 @@
c_tag = "Arrivals Dock";
name = "shuttle camera"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTO" = (
@@ -63168,17 +63186,17 @@
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/exit/departure_lounge)
"bTS" = (
/obj/docking_port/stationary{
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/wood,
/area/security/vacantoffice)
"bTT" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -63287,8 +63305,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 6
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -63398,12 +63419,8 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"bUl" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
/turf/closed/wall,
/area/security/vacantoffice)
"bUm" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -63464,9 +63481,8 @@
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/exit/departure_lounge)
"bUt" = (
/obj/structure/sign/warning/electricshock,
/turf/closed/wall/rust,
/area/hallway/secondary/entry)
/area/security/vacantoffice)
"bUu" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -64674,11 +64690,21 @@
},
/area/maintenance/starboard/aft)
"bWn" = (
/obj/machinery/door/airlock/external{
name = "Common Mining Dock"
/obj/machinery/door/airlock/maintenance{
name = "Vacant Office"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
/area/security/vacantoffice)
"bWo" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -64718,6 +64744,15 @@
/area/security/warden)
"bWq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "2-8"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bWr" = (
@@ -64799,17 +64834,8 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bWx" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
/turf/closed/wall,
/area/security/vacantoffice)
"bWy" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -65052,15 +65078,18 @@
dir = 4;
pixel_x = -23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bWV" = (
@@ -65105,6 +65134,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bWY" = (
@@ -65133,6 +65165,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 9
},
/obj/structure/cable{
icon_state = "1-8"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bXa" = (
@@ -65289,6 +65324,9 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"bXo" = (
@@ -65367,6 +65405,9 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"bXv" = (
@@ -65786,6 +65827,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bXY" = (
@@ -66680,6 +66724,9 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bZk" = (
@@ -67429,6 +67476,9 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{
dir = 1
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cal" = (
@@ -67587,7 +67637,7 @@
"cav" = (
/obj/structure/sign/poster/contraband/random,
/turf/closed/wall,
/area/hallway/secondary/entry)
/area/security/vacantoffice)
"caw" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -67848,6 +67898,10 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"caP" = (
@@ -67855,6 +67909,9 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 5
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"caQ" = (
@@ -70240,9 +70297,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -74728,6 +74782,9 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
"cmk" = (
@@ -81480,8 +81537,18 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/port)
"cyG" = (
/turf/open/floor/plating,
/area/hallway/secondary/entry)
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
areastring = "/area/security/vacant";
name = "Vacant Office APC";
pixel_y = 24
},
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
/turf/open/floor/wood,
/area/security/vacantoffice)
"cyI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink/kitchen{
@@ -85332,6 +85399,9 @@
"cJp" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"cJq" = (
@@ -87185,9 +87255,22 @@
"cZm" = (
/turf/closed/wall/rust,
/area/security/prison)
"dbY" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
dir = 1
},
/obj/structure/chair/stool,
/turf/open/floor/wood{
icon_state = "wood-broken"
},
/area/security/vacantoffice)
"dis" = (
/turf/closed/wall/r_wall/rust,
/area/bridge)
"dlg" = (
/obj/machinery/light,
/turf/open/floor/wood,
/area/security/vacantoffice)
"dxq" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral{
@@ -87242,6 +87325,14 @@
icon_state = "panelscorched"
},
/area/maintenance/starboard/fore)
"eaJ" = (
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/airalarm/directional/west,
/obj/item/twohanded/required/kirbyplants/dead,
/turf/open/floor/wood,
/area/security/vacantoffice)
"elZ" = (
/obj/machinery/status_display/evac,
/turf/closed/wall/rust,
@@ -87338,6 +87429,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"fkk" = (
/turf/open/floor/wood{
icon_state = "wood-broken6"
},
/area/security/vacantoffice)
"fyr" = (
/obj/machinery/light{
dir = 4
@@ -87362,6 +87458,11 @@
dir = 8
},
/area/hallway/primary/fore)
"gmF" = (
/turf/open/floor/wood{
icon_state = "wood-broken"
},
/area/security/vacantoffice)
"gnA" = (
/obj/machinery/airalarm{
dir = 1;
@@ -87428,9 +87529,20 @@
/obj/structure/sign/departments/evac,
/turf/closed/wall/rust,
/area/hallway/secondary/exit/departure_lounge)
"gKu" = (
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/wood,
/area/security/vacantoffice)
"gMU" = (
/turf/closed/wall/r_wall/rust,
/area/ai_monitored/turret_protected/ai_upload)
"gPA" = (
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
/area/security/vacantoffice)
"hgW" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/chair/stool,
@@ -87452,6 +87564,12 @@
"hAb" = (
/turf/closed/wall/r_wall/rust,
/area/security/courtroom)
"hDh" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/closet/cardboard,
/obj/effect/spawner/bundle/costume/maid,
/turf/open/floor/wood,
/area/security/vacantoffice)
"hNk" = (
/turf/closed/wall/r_wall/rust,
/area/security/prison)
@@ -87660,17 +87778,12 @@
/turf/closed/mineral/random/labormineral,
/area/space/nearstation)
"jQY" = (
/obj/structure/cable{
icon_state = "1-2"
/obj/structure/table/wood,
/obj/item/paper_bin,
/turf/open/floor/wood{
icon_state = "wood-broken4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
/obj/item/clothing/under/costume/maid,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
/area/maintenance/starboard/aft)
/area/security/vacantoffice)
"jRw" = (
/obj/structure/sign/poster/official/high_class_martini,
/turf/closed/wall/r_wall,
@@ -87753,6 +87866,18 @@
},
/turf/open/floor/wood,
/area/maintenance/port/fore)
"jUX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 6
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/wood,
/area/security/vacantoffice)
"jUZ" = (
/obj/item/poster/random_contraband,
/obj/item/poster/random_contraband,
@@ -87773,6 +87898,10 @@
"khA" = (
/turf/closed/wall/rust,
/area/construction/mining/aux_base)
"koc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/turf/open/floor/wood,
/area/security/vacantoffice)
"krJ" = (
/turf/closed/wall/rust,
/area/hallway/secondary/exit/departure_lounge)
@@ -87794,6 +87923,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"kzw" = (
/obj/structure/chair/office/dark{
dir = 8
},
/turf/open/floor/wood,
/area/security/vacantoffice)
"kIJ" = (
/turf/open/floor/wood{
icon_state = "wood-broken7"
@@ -87803,6 +87938,11 @@
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/maintenance/port/fore)
"kXo" = (
/obj/structure/table/wood/poker,
/obj/item/toy/cards/deck,
/turf/open/floor/wood,
/area/security/vacantoffice)
"leX" = (
/obj/structure/chair/stool,
/turf/open/floor/wood{
@@ -87883,6 +88023,17 @@
},
/turf/open/floor/plasteel/dark,
/area/science/research)
"mKp" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
},
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/security/vacantoffice)
"mLN" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/mineral/random/labormineral,
@@ -87953,6 +88104,19 @@
},
/turf/open/space/basic,
/area/hallway/secondary/entry)
"oUc" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/folder/paperwork,
/turf/open/floor/wood,
/area/security/vacantoffice)
"ppP" = (
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
/area/security/vacantoffice)
"pCe" = (
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating/asteroid/airless,
@@ -88190,12 +88354,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"uqy" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/under/rank/civilian/janitor/maid,
/turf/open/floor/plating{
icon_state = "platingdmg1"
/obj/machinery/light{
dir = 1
},
/area/maintenance/starboard/aft)
/turf/open/floor/wood,
/area/security/vacantoffice)
"uxQ" = (
/obj/effect/decal/cleanable/ash,
/turf/closed/mineral/random/labormineral,
@@ -88203,9 +88366,20 @@
"uzR" = (
/turf/closed/wall/rust,
/area/storage/primary)
"uGi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
/area/security/vacantoffice)
"uRM" = (
/turf/open/floor/wood,
/area/security/vacantoffice)
"uWo" = (
/turf/closed/wall/rust,
/area/security/checkpoint/medical)
"vle" = (
/obj/structure/festivus,
/turf/open/floor/wood,
/area/security/vacantoffice)
"vmu" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral{
@@ -88231,6 +88405,10 @@
/mob/living/simple_animal/pet/bumbles,
/turf/open/floor/plasteel,
/area/hydroponics)
"wiK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/wood,
/area/security/vacantoffice)
"wmX" = (
/turf/closed/wall/rust,
/area/quartermaster/qm)
@@ -88328,6 +88506,10 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"ykB" = (
/obj/structure/chair/stool,
/turf/open/floor/wood,
/area/security/vacantoffice)
(1,1,1) = {"
aaa
@@ -125762,7 +125944,7 @@ bOl
bSJ
bSI
ukP
uqy
bGr
bEg
bAT
bOC
@@ -126016,10 +126198,10 @@ bNw
bTP
bUu
bWh
bTy
cax
cxB
ceN
jQY
chZ
cxB
cjE
bXb
@@ -126270,15 +126452,15 @@ bOA
bOH
bSH
bNw
bSr
bWx
aEK
bSd
bUl
bSd
bUl
bSr
bUt
bSd
bWx
bUt
bWx
bWx
bUt
bUt
bXj
ckS
bUu
@@ -126527,15 +126709,15 @@ bNM
tYn
aVM
bNx
bSr
bWx
cyG
cyG
cyG
cyG
cyG
cyG
cyG
bSr
mKp
oUc
eaJ
uRM
uRM
vle
bWx
bXz
ccB
cgb
@@ -126785,14 +126967,14 @@ bZW
bWw
bTq
bSL
cyG
cyG
cyG
cyG
cyG
cyG
cyG
bSr
jQY
kzw
gmF
gKu
uRM
uRM
uRM
bWx
bEg
bEg
bEg
@@ -127041,15 +127223,15 @@ cad
bhY
car
bTr
bSr
cyG
cyG
cyG
cyG
cyG
cyG
cyG
bSr
bWx
uqy
wiK
uGi
jUX
koc
dbY
dlg
bWx
bYf
ceU
cgI
@@ -127299,14 +127481,14 @@ bQQ
bSN
bTs
cav
cyG
cyG
cyG
cyG
cyG
cyG
cyG
bSr
uRM
fkk
ppP
bTS
ykB
kXo
ykB
bWx
bPJ
bUN
hxn
@@ -127555,15 +127737,15 @@ bTk
bXL
bXx
bPe
bSd
cyG
cyG
cyG
bUt
hDh
uRM
uRM
bTS
cyG
cyG
cyG
bSr
uRM
ykB
gPA
bWx
bPJ
bQa
hxn
@@ -127815,12 +127997,12 @@ bTv
krJ
krJ
krJ
bPe
bOc
bWn
bWx
bSr
bWx
bSL
bSr
bWx
bSr
cgx
hxn
@@ -129096,7 +129278,7 @@ bMO
bOR
cak
aIY
cmD
bTy
bTe
bXu
bXn