cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports delta shuttle to cyberiad (#13727)

Browse Source
This commit is contained in:
AffectedArc07
2020-07-12 14:54:20 -06:00
committed by GitHub
parent a86b5e6834
commit 9437b6d9eb
4 changed files with 2986 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/cyberiad.dmm
+1303 -758
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/cyberiad/z2.dmm
+224 -224
View File
@@ -49262,7 +49262,6 @@ aN
aN
aN
aN
aN
ih
ih
ih
@@ -49277,12 +49276,13 @@ ih
ih
ih
aN
aN
aN
aN
aN
aN
aN
nj
nj
nj
nj
nj
nj
nj
nj
nj
nj
@@ -49519,7 +49519,6 @@ aN
aN
aN
aN
aN
ih
fk
fo
@@ -49534,12 +49533,6 @@ gL
gD
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -49564,6 +49557,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ae
ab
ab
@@ -49776,7 +49776,6 @@ aN
aN
aN
aN
aN
ih
fj
fo
@@ -49791,12 +49790,6 @@ gC
gU
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -49818,6 +49811,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ae
ab
ab
@@ -50033,7 +50033,6 @@ aN
aN
aN
aN
aN
ih
fo
fo
@@ -50048,12 +50047,6 @@ gE
mb
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -50076,6 +50069,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ae
ab
ab
@@ -50290,7 +50290,6 @@ fg
fg
aN
aN
aN
ih
fn
fo
@@ -50305,12 +50304,6 @@ fo
gl
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -50336,6 +50329,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ac
ab
ab
@@ -50547,7 +50547,6 @@ hF
fg
aN
aN
aN
ih
fq
fo
@@ -50562,12 +50561,6 @@ fo
gV
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -50589,6 +50582,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ac
ab
ae
@@ -50804,7 +50804,6 @@ hF
fg
aN
aN
aN
ih
fp
fo
@@ -50819,12 +50818,6 @@ fo
gu
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -50846,6 +50839,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ae
ab
ab
@@ -51061,7 +51061,6 @@ hF
fg
aN
aN
aN
ih
ih
fo
@@ -51076,12 +51075,6 @@ gN
gW
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ac
@@ -51107,6 +51100,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ag
ab
ab
@@ -51318,7 +51318,6 @@ hF
fg
aN
aN
aN
ih
fr
fx
@@ -51333,12 +51332,6 @@ gM
lu
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -51359,6 +51352,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ae
ab
ac
@@ -51575,7 +51575,6 @@ fg
fg
aN
aN
aN
ih
ft
fz
@@ -51590,12 +51589,6 @@ gN
gX
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -51617,6 +51610,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hj
hj
hj
@@ -51832,7 +51832,6 @@ aN
aN
aN
aN
aN
ih
fs
fy
@@ -51847,12 +51846,6 @@ gM
dd
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -51871,6 +51864,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hj
hj
hq
@@ -52089,7 +52089,6 @@ aN
aN
aN
aN
aN
ih
ih
ih
@@ -52104,12 +52103,6 @@ ih
ih
ih
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -52128,6 +52121,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
ho
hr
@@ -52360,13 +52360,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -52385,6 +52378,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hl
hn
hn
@@ -52617,13 +52617,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -52642,6 +52635,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
ho
hr
@@ -52874,13 +52874,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -52898,6 +52891,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hi
hl
hn
@@ -53131,13 +53131,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -53156,6 +53149,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
ho
hr
@@ -53388,13 +53388,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -53413,6 +53406,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hm
hm
hs
@@ -53645,13 +53645,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -53672,6 +53665,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ag
hz
hn
@@ -53902,13 +53902,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ac
ab
@@ -53927,6 +53920,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hj
hj
hq
@@ -54159,13 +54159,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -54184,6 +54177,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
ho
hr
@@ -54416,13 +54416,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -54441,6 +54434,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hl
hn
hn
@@ -54673,13 +54673,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -54698,6 +54691,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
ho
hr
@@ -54930,13 +54930,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -54955,6 +54948,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hl
hn
hn
@@ -55187,13 +55187,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -55212,6 +55205,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
ho
hr
@@ -55444,13 +55444,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -55469,6 +55462,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
hm
hm
ht
@@ -55701,13 +55701,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -55728,6 +55721,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ag
nj
hn
@@ -55958,13 +55958,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -55984,6 +55977,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ac
ag
nj
@@ -56215,13 +56215,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -56243,6 +56236,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
hn
hn
@@ -56472,13 +56472,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -56500,6 +56493,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
hn
hn
@@ -56729,13 +56729,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -56756,6 +56749,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ae
nj
hn
@@ -56986,13 +56986,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
nj
ab
ab
@@ -57014,6 +57007,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
nj
hn
hn
@@ -57244,13 +57244,6 @@ aN
aN
aN
nj
nj
nj
nj
nj
nj
nj
nj
ab
ab
ac
@@ -57268,6 +57261,13 @@ ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ac
ab
ab
_maps/map_files/shuttles/emergency_cyb.dmm
+1269 -517
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/shuttles/emergency_old.dmm
+190 -113
View File
@@ -38,7 +38,7 @@
/area/shuttle/escape)
"ah" = (
/obj/machinery/computer/security{
network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
@@ -192,9 +192,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aF" = (
/obj/structure/grille,
@@ -214,33 +212,6 @@
icon_state = "floor3"
},
/area/shuttle/escape)
"aH" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular{
pixel_x = 2;
pixel_y = 6
},
/obj/item/storage/firstaid/regular{
pixel_x = -2;
pixel_y = 4
},
/obj/item/bodybag{
pixel_x = 5
},
/obj/item/radio/intercom{
dir = 4;
name = "station intercom (General)";
pixel_x = 28
},
/obj/item/storage/firstaid/o2{
layer = 2.8;
pixel_x = 4;
pixel_y = 6
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"aI" = (
/turf/simulated/shuttle/floor{
icon_state = "floor3"
@@ -311,10 +282,6 @@
icon_state = "floor3"
},
/area/shuttle/escape)
"aO" = (
/obj/machinery/recharge_station,
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aP" = (
/obj/machinery/door/airlock/shuttle{
aiControlDisabled = 1;
@@ -346,10 +313,11 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aT" = (
/obj/machinery/door/airlock/medical/glass{
/obj/machinery/door/airlock/shuttle{
aiControlDisabled = 1;
hackProof = 1;
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
name = "Shuttle Cargo Hatch"
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
@@ -363,11 +331,12 @@
},
/area/shuttle/escape)
"aV" = (
/obj/machinery/door/airlock/security/glass{
name = "Escape Shuttle Cell";
req_access_txt = "2"
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Escape Shuttle Infirmary";
req_access_txt = "0"
},
/turf/simulated/shuttle/floor4,
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aW" = (
/obj/machinery/door/airlock/shuttle{
@@ -376,14 +345,12 @@
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aX" = (
/obj/structure/bed/roller,
/obj/structure/closet/crate,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
icon_state = "floor2"
},
/area/shuttle/escape)
"aZ" = (
@@ -394,30 +361,19 @@
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"bb" = (
/obj/machinery/sleeper{
icon_state = "sleeper-open";
dir = 4
},
/obj/structure/closet/cardboard,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
icon_state = "floor2"
},
/area/shuttle/escape)
"bc" = (
/obj/structure/bed/roller,
/obj/machinery/vending/wallmed{
layer = 3.3;
name = "Emergency NanoMed";
pixel_x = 28;
pixel_y = 0;
req_access_txt = "0"
},
/obj/machinery/light/spot{
tag = "icon-tube1 (EAST)";
icon_state = "tube1";
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
icon_state = "floor2"
},
/area/shuttle/escape)
"bd" = (
@@ -430,7 +386,9 @@
icon_state = "tube1";
dir = 8
},
/turf/simulated/shuttle/floor4,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"be" = (
/obj/item/radio/intercom{
@@ -438,16 +396,17 @@
name = "station intercom (General)";
pixel_x = 28
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"bf" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/structure/bed/roller,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"bf" = (
/obj/machinery/mech_bay_recharge_port,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/area/shuttle/escape)
"bh" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
@@ -492,6 +451,124 @@
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/shuttle/plating,
/area/shuttle/escape)
"db" = (
/obj/machinery/door/airlock/security/glass{
name = "Escape Shuttle Cell";
req_access_txt = "2"
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"ev" = (
/obj/machinery/sleeper{
tag = "icon-sleeper (NORTH)";
icon_state = "sleeper";
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"iM" = (
/obj/structure/table,
/obj/item/storage/firstaid/o2{
layer = 2.8;
pixel_x = 4;
pixel_y = 6
},
/obj/item/storage/firstaid/regular{
pixel_x = 2;
pixel_y = 6
},
/obj/item/storage/firstaid/regular{
pixel_x = -2;
pixel_y = 4
},
/obj/item/bodybag{
pixel_x = 5
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"kP" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall7";
icon_state = "swall7";
dir = 2
},
/area/shuttle/escape)
"lJ" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"mk" = (
/obj/machinery/status_display{
pixel_y = 30
},
/obj/machinery/light/spot{
tag = "icon-tube1 (NORTH)";
icon_state = "tube1";
dir = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"rj" = (
/obj/machinery/vending/wallmed{
layer = 3.3;
name = "Emergency NanoMed";
pixel_x = 28;
pixel_y = 0;
req_access_txt = "0"
},
/obj/structure/bed/roller,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"xo" = (
/obj/machinery/recharge_station,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/area/shuttle/escape)
"zT" = (
/obj/structure/noticeboard,
/turf/simulated/shuttle/wall{
icon_state = "swall12";
dir = 2
},
/area/shuttle/escape)
"Bs" = (
/obj/machinery/door/airlock/shuttle{
aiControlDisabled = 1;
hackProof = 1;
id_tag = "s_docking_airlock";
name = "Shuttle Hatch"
},
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/area/shuttle/escape)
"DZ" = (
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/area/shuttle/escape)
"OC" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle{
icon_state = "15"
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"XL" = (
/turf/simulated/floor/mech_bay_recharge_floor,
/area/shuttle/escape)
(1,1,1) = {"
aa
@@ -504,7 +581,7 @@ ab
ar
ar
aW
ar
kP
ak
ar
aD
@@ -512,8 +589,8 @@ aF
aJ
ar
aP
ar
aW
kP
Bs
ac
ar
bi
@@ -527,10 +604,10 @@ aa
aa
aa
aw
aA
lJ
aE
aI
aA
ba
aw
an
aL
aA
@@ -538,8 +615,8 @@ aA
aA
aN
an
aR
aI
aw
DZ
bb
bf
az
@@ -553,7 +630,10 @@ aa
ab
ar
ax
aB
mk
ba
ba
aw
an
an
an
@@ -561,13 +641,10 @@ an
an
an
an
an
an
an
aS
aI
aI
aI
zT
DZ
DZ
XL
bj
bo
"}
@@ -579,10 +656,10 @@ ac
ae
as
aw
aC
aC
aC
aC
aZ
ba
bh
aw
an
aC
aC
@@ -591,9 +668,9 @@ aC
an
an
aT
aI
aI
aI
DZ
DZ
xo
bj
bo
"}
@@ -605,10 +682,10 @@ al
ap
at
aw
aD
aF
aF
aJ
aZ
ba
bh
aw
an
aD
aF
@@ -616,10 +693,10 @@ aF
aJ
an
an
ac
aw
aX
bc
aH
xo
bj
bo
"}
@@ -631,10 +708,10 @@ ai
an
an
aw
aA
aA
aA
aA
ac
db
aD
OC
an
aA
aA
@@ -721,9 +798,9 @@ aJ
an
an
ac
aZ
iM
bd
bh
ev
bm
bo
"}
@@ -747,9 +824,9 @@ aA
an
an
aV
ba
ba
bh
aI
aI
aI
bm
bo
"}
@@ -773,9 +850,9 @@ an
an
an
aR
aZ
ba
bh
aI
aI
ev
bm
bo
"}
@@ -796,12 +873,12 @@ aM
aC
aC
aC
aO
aO
an
an
aS
aZ
rj
be
bh
aI
az
bn
"}