Fixes shuttles in transit having non-moving space on some diagonal edges (#19452)

* Fixes shuttles in transit having non-moving space on some diagonal edges

* it'll be
fine

* one moment, one second
one beautiful blessed scout attack
This commit is contained in:
Joan Lung
2016-07-25 05:14:36 -04:00
committed by oranges
parent 67cbfabbfd
commit 0fe4ad11de
25 changed files with 971 additions and 1077 deletions

View File

@@ -184,7 +184,6 @@
/area/shuttle/supply)
(1,1,1) = {"
a
b
b
b
@@ -192,7 +191,8 @@ b
b
b
b
s
b
b
w
"}
(2,1,1) = {"
@@ -256,7 +256,7 @@ b
z
"}
(7,1,1) = {"
a
b
b
b
l
@@ -264,6 +264,6 @@ o
b
q
r
s
b
w
"}

View File

@@ -145,7 +145,6 @@
/area/shuttle/supply)
(1,1,1) = {"
a
b
b
b
@@ -155,7 +154,8 @@ b
b
b
b
a
b
b
s
"}
(2,1,1) = {"
@@ -229,7 +229,7 @@ b
v
"}
(7,1,1) = {"
a
b
b
b
f
@@ -239,6 +239,6 @@ i
j
b
b
a
b
s
"}

View File

@@ -511,7 +511,7 @@
(1,1,1) = {"
aa
aa
ab
ac
am
ac
ad
@@ -519,12 +519,12 @@ ad
bI
ac
am
ab
ac
aa
aa
"}
(2,1,1) = {"
ab
ac
am
ac
an
@@ -536,7 +536,7 @@ ac
an
ac
am
ab
ac
"}
(3,1,1) = {"
ac
@@ -614,7 +614,7 @@ bE
ad
"}
(8,1,1) = {"
ab
ac
ac
ac
aG
@@ -626,11 +626,11 @@ az
bu
az
ac
ab
ac
"}
(9,1,1) = {"
ag
ab
ac
ac
aH
at
@@ -640,7 +640,7 @@ at
at
at
ac
ab
ac
aa
"}
(10,1,1) = {"
@@ -810,7 +810,7 @@ aa
"}
(21,1,1) = {"
ag
ag
ac
ac
aN
at
@@ -820,11 +820,11 @@ at
at
aN
ac
aa
ac
aa
"}
(22,1,1) = {"
ab
ac
ac
ac
ad
@@ -836,7 +836,7 @@ br
ad
ac
ac
ab
ac
"}
(23,1,1) = {"
ac
@@ -884,7 +884,7 @@ bH
ac
"}
(26,1,1) = {"
ab
ac
ac
ac
ac
@@ -896,12 +896,12 @@ ad
ac
ac
ac
ab
ac
"}
(27,1,1) = {"
aa
aa
ab
ac
ac
aQ
aw
@@ -909,7 +909,7 @@ ad
at
bs
ac
ab
ac
aa
aa
"}
@@ -917,13 +917,13 @@ aa
ag
ag
ag
ab
ac
ac
ad
ac
ad
ac
ab
ac
aa
aa
aa

View File

@@ -606,7 +606,7 @@ aa
aa
aa
aa
ab
bt
bt
bt
aK
@@ -622,12 +622,12 @@ bt
bo
bt
bt
bA
bt
aa
"}
(2,1,1) = {"
aa
ab
bt
bt
bt
bt
@@ -646,11 +646,11 @@ bt
bp
bs
bx
bB
bB
bt
bt
"}
(3,1,1) = {"
ab
bt
ae
al
aq
@@ -794,7 +794,7 @@ bC
bE
"}
(9,1,1) = {"
ab
bt
ae
ap
au
@@ -819,7 +819,7 @@ bE
"}
(10,1,1) = {"
aa
ab
bt
bt
bt
bt
@@ -838,15 +838,15 @@ bF
br
br
bU
bB
bB
bt
bt
"}
(11,1,1) = {"
aa
aa
aa
aa
ab
bt
ac
bt
ac
@@ -862,6 +862,6 @@ bt
ac
bt
ac
bD
bt
aa
"}

View File

@@ -265,7 +265,7 @@
(1,1,1) = {"
a
a
b
c
c
d
c
@@ -274,13 +274,13 @@ d
d
d
d
b
c
a
a
"}
(2,1,1) = {"
a
b
c
i
p
l
@@ -291,7 +291,7 @@ F
F
z
i
b
c
a
"}
(3,1,1) = {"
@@ -356,7 +356,7 @@ A
A
N
i
b
c
"}
(7,1,1) = {"
a
@@ -455,7 +455,7 @@ z
c
"}
(13,1,1) = {"
b
c
c
c
c
@@ -535,18 +535,18 @@ c
c
"}
(18,1,1) = {"
b
c
h
o
t
b
i
c
c
E
H
i
b
c
c
h
o
t
b
c
"}

View File

@@ -384,7 +384,7 @@ aa
aa
aa
aa
ab
ak
ak
ak
aI
@@ -400,12 +400,12 @@ ak
aV
ak
ak
ab
ak
aa
"}
(2,1,1) = {"
aa
ab
ak
ak
ak
ak
@@ -425,10 +425,10 @@ bb
bb
bf
ak
ab
ak
"}
(3,1,1) = {"
ab
ak
ae
al
aq
@@ -572,7 +572,7 @@ bi
bk
"}
(9,1,1) = {"
ab
ak
ae
ap
au
@@ -597,7 +597,7 @@ bk
"}
(10,1,1) = {"
aa
ab
ak
ak
ak
ak
@@ -617,14 +617,14 @@ bd
be
bd
ak
ab
ak
"}
(11,1,1) = {"
aa
aa
aa
aa
ab
ak
ac
ak
ac
@@ -640,6 +640,6 @@ ak
ac
ak
ac
ab
ak
aa
"}

View File

@@ -1,41 +1,35 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
"a" = (
/turf/open/space,
/area/space)
"ab" = (
/turf/closed/wall/mineral/titanium/overspace,
"b" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ac" = (
"c" = (
/obj/structure/grille,
/obj/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/escape)
"ad" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/area/shuttle/escape)
"ae" = (
"d" = (
/turf/open/floor/mineral/titanium,
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/escape)
"af" = (
"e" = (
/obj/structure/table,
/obj/item/weapon/storage/firstaid/fire,
/turf/open/floor/noslip,
/area/shuttle/escape)
"ag" = (
"f" = (
/obj/structure/chair{
dir = 1
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"ah" = (
"g" = (
/obj/machinery/computer/emergency_shuttle,
/turf/open/floor/bluespace,
/area/shuttle/escape)
"ai" = (
"h" = (
/obj/structure/table,
/obj/item/weapon/storage/firstaid/regular{
pixel_x = 2;
@@ -44,44 +38,35 @@
/obj/item/weapon/crowbar,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aj" = (
/turf/open/floor/plasteel/shuttle/white,
/turf/closed/wall/shuttle/interior{
icon_state = "swall_f5"
},
/area/shuttle/escape)
"ak" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"al" = (
"i" = (
/obj/machinery/computer/atmos_alert,
/turf/open/floor/noslip,
/area/shuttle/escape)
"am" = (
"j" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"an" = (
"k" = (
/obj/item/toy/snappop/phoenix,
/turf/open/floor/bluespace,
/area/shuttle/escape)
"ao" = (
"l" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"ap" = (
"m" = (
/obj/machinery/computer/security,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aq" = (
"n" = (
/obj/machinery/computer/crew,
/turf/open/floor/noslip,
/area/shuttle/escape)
"ar" = (
"o" = (
/obj/structure/chair{
dir = 8
},
@@ -91,7 +76,7 @@
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"as" = (
"p" = (
/obj/item/device/radio/intercom{
name = "Station Intercom (General)";
pixel_x = 0;
@@ -100,51 +85,33 @@
/obj/item/toy/snappop/phoenix,
/turf/open/floor/bluespace,
/area/shuttle/escape)
"at" = (
"q" = (
/obj/machinery/computer/communications,
/turf/open/floor/noslip,
/area/shuttle/escape)
"au" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/area/shuttle/escape)
"av" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/area/shuttle/escape)
"aw" = (
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/area/shuttle/escape)
"ax" = (
"r" = (
/obj/machinery/door/airlock/glass{
name = "Emergency Shuttle Premium Lounge";
req_access_txt = "0"
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"ay" = (
"s" = (
/obj/machinery/status_display,
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"az" = (
"t" = (
/turf/open/chasm/straight_down/lava_land_surface/normal_air,
/area/shuttle/escape)
"aA" = (
"u" = (
/turf/open/floor/noslip,
/area/shuttle/escape)
"aB" = (
"v" = (
/obj/structure/closet/emcloset,
/obj/item/toy/sword,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aC" = (
"w" = (
/obj/structure/table,
/obj/item/weapon/storage/firstaid/fire,
/obj/item/weapon/storage/firstaid/regular{
@@ -154,49 +121,43 @@
/obj/item/weapon/crowbar,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aD" = (
"x" = (
/obj/item/weapon/greentext/quiet{
anchored = 1
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aE" = (
"y" = (
/obj/machinery/door/airlock/glass{
name = "Emergency Shuttle Greentext";
req_access_txt = "0"
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aF" = (
"z" = (
/obj/structure/chair,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aG" = (
"A" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"aH" = (
"B" = (
/obj/structure/table,
/obj/item/device/multitool/ai_detect,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aI" = (
/turf/closed/wall/shuttle{
icon_state = "swall7";
dir = 2
},
/area/shuttle/escape)
"aJ" = (
"C" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aK" = (
"D" = (
/obj/structure/table,
/obj/item/toy/sword,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aL" = (
"E" = (
/obj/machinery/door/airlock/shuttle{
name = "Emergency Shuttle Airlock"
},
@@ -206,7 +167,7 @@
},
/turf/open/floor/plating,
/area/shuttle/escape)
"aM" = (
"F" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
pixel_y = 30
@@ -214,7 +175,7 @@
/obj/item/toy/snappop/phoenix,
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aN" = (
"G" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27;
pixel_y = 0
@@ -222,12 +183,12 @@
/obj/item/toy/snappop/phoenix,
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aO" = (
"H" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/random,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aP" = (
"I" = (
/obj/structure/window/reinforced{
dir = 4
},
@@ -235,7 +196,7 @@
/obj/item/weapon/bedsheet/random,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aQ" = (
"J" = (
/obj/structure/window/reinforced{
dir = 8
},
@@ -243,7 +204,7 @@
/obj/item/weapon/bedsheet/random,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aR" = (
"K" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/random,
/obj/structure/window/reinforced{
@@ -251,13 +212,13 @@
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"aS" = (
"L" = (
/obj/machinery/door/airlock/shuttle{
name = "Emergency Shuttle Airlock"
},
/turf/open/floor/plating,
/area/shuttle/escape)
"aT" = (
"M" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 0;
pixel_y = -30
@@ -265,53 +226,36 @@
/obj/item/toy/snappop/phoenix,
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aU" = (
/obj/item/toy/snappop/phoenix,
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aV" = (
"N" = (
/obj/machinery/door/airlock/shuttle{
name = "Emergency Shuttle Cargo"
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aW" = (
/obj/machinery/status_display,
/turf/closed/wall/shuttle{
icon_state = "swall14";
dir = 2
},
/area/shuttle/escape)
"aX" = (
"O" = (
/obj/machinery/door/airlock/glass{
name = "Emergency Shuttle Infirmary"
},
/turf/open/floor/bluespace,
/area/shuttle/escape)
"aY" = (
/turf/closed/wall/shuttle{
icon_state = "swall11";
dir = 2
},
/area/shuttle/escape)
"aZ" = (
"P" = (
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"ba" = (
"Q" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27;
pixel_y = 0
},
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"bb" = (
"R" = (
/obj/machinery/sleeper{
icon_state = "sleeper-open";
dir = 8
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"bc" = (
"S" = (
/obj/structure/table,
/obj/item/weapon/storage/firstaid/fire,
/obj/item/weapon/storage/firstaid/regular{
@@ -325,311 +269,299 @@
},
/turf/open/floor/noslip,
/area/shuttle/escape)
"bd" = (
"T" = (
/obj/structure/closet/crate/trashcart{
desc = "A heavy, metal trashcart with wheels. Feel free to hop in at any time!"
},
/obj/item/toy/sword,
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"be" = (
"U" = (
/obj/machinery/vending/autodrobe{
extended_inventory = 1;
scan_id = 0
},
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"bf" = (
"V" = (
/obj/machinery/vending/clothing{
extended_inventory = 1
},
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"bg" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
},
/area/shuttle/escape)
"bh" = (
"W" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bi" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/area/shuttle/escape)
"bj" = (
"X" = (
/obj/structure/shuttle/engine/propulsion,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
(1,1,1) = {"
aa
aa
aa
aa
ab
ak
ak
ak
ak
aL
ak
ac
ac
ac
ak
aS
ak
aS
ak
ak
ab
aa
a
a
a
a
b
b
b
b
b
E
b
c
c
c
b
L
b
L
b
b
b
a
"}
(2,1,1) = {"
aa
ab
ak
ak
ak
az
az
az
ak
an
aO
aO
aO
aO
aO
an
ak
aZ
aZ
bd
ak
ab
a
b
b
b
b
t
t
t
b
k
H
H
H
H
H
k
b
P
P
T
b
b
"}
(3,1,1) = {"
ab
ae
al
aq
ak
az
aD
az
ak
aM
an
an
an
an
an
aT
ak
aZ
aZ
bd
bh
bj
b
d
i
n
b
t
x
t
b
F
k
k
k
k
k
M
b
P
P
T
W
X
"}
(4,1,1) = {"
ac
af
am
ar
ak
az
az
az
ak
an
aP
aP
aP
aP
aP
an
aV
aZ
aZ
be
bh
bj
c
e
j
o
b
t
t
t
b
k
I
I
I
I
I
k
N
P
P
U
W
X
"}
(5,1,1) = {"
ac
ag
an
as
ak
ac
aE
ac
aJ
an
aQ
aQ
aQ
aQ
aQ
an
ak
ba
aZ
bf
bh
bj
c
f
k
p
b
c
y
c
C
k
J
J
J
J
J
k
b
Q
P
V
W
X
"}
(6,1,1) = {"
ac
ah
an
an
ak
aA
an
aF
aK
an
an
an
an
an
an
an
ay
ak
ak
ak
bh
bj
c
g
k
k
b
u
k
z
D
k
k
k
k
k
k
k
s
b
b
b
W
X
"}
(7,1,1) = {"
ac
ag
an
an
ax
an
an
aG
aK
an
aP
aP
aP
aP
aP
an
ac
aB
aA
aB
bh
bj
c
f
k
k
r
k
k
A
D
k
I
I
I
I
I
k
c
v
u
v
W
X
"}
(8,1,1) = {"
ac
ai
ao
ao
ay
aA
an
aH
aK
an
aR
aQ
aQ
aQ
aQ
an
aX
aA
aA
aA
bh
bj
c
h
l
l
s
u
k
B
D
k
K
J
J
J
J
k
O
u
u
u
W
X
"}
(9,1,1) = {"
ab
ae
ap
at
ak
aB
an
an
an
an
an
an
an
an
an
an
ac
aA
aA
aA
bh
bj
b
d
m
q
b
v
k
k
k
k
k
k
k
k
k
k
c
u
u
u
W
X
"}
(10,1,1) = {"
aa
ab
ak
ak
ak
aC
aA
aA
aA
aN
aO
aO
aO
aO
aO
aN
ac
bb
bc
bb
ak
ab
a
b
b
b
b
w
u
u
u
G
H
H
H
H
H
G
c
R
S
R
b
b
"}
(11,1,1) = {"
aa
aa
aa
aa
ab
ac
ak
ac
ak
ak
ak
ac
ac
ac
ak
ak
ak
ac
ak
ac
ab
aa
a
a
a
a
b
c
b
c
b
b
b
c
c
c
b
b
b
c
b
c
b
a
"}

View File

@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/shuttle/smooth,
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"b" = (
/obj/structure/grille,
@@ -119,55 +119,25 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"u" = (
/turf/open/space,
/area/space)
"v" = (
/obj/structure/shuttle/engine/propulsion,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"w" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/escape)
"x" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s10";
dir = 2
},
/area/shuttle/escape)
"y" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"z" = (
/turf/closed/wall/shuttle{
icon_state = "swall2";
dir = 2
},
/area/shuttle/escape)
"A" = (
/turf/closed/wall/shuttle{
icon_state = "swall1";
dir = 2
},
/area/shuttle/escape)
"B" = (
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/escape)
(1,1,1) = {"
w
a
c
y
a
k
y
a
b
b
b
y
a
q
y
a
q
B
u
a
a
"}
(2,1,1) = {"
b
@@ -183,7 +153,7 @@ l
s
l
t
v
u
"}
(3,1,1) = {"
b
@@ -199,7 +169,7 @@ l
l
l
t
v
u
"}
(4,1,1) = {"
b
@@ -215,21 +185,21 @@ r
r
m
t
v
"}
(5,1,1) = {"
w
y
j
y
y
b
b
b
y
y
y
y
B
u
"}
(5,1,1) = {"
a
a
j
a
a
b
b
b
a
a
a
a
a
a
"}

View File

@@ -262,7 +262,7 @@
(1,1,1) = {"
a
e
d
b
b
b
@@ -270,7 +270,7 @@ d
b
b
b
e
d
a
"}
(2,1,1) = {"
@@ -313,7 +313,7 @@ d
d
"}
(5,1,1) = {"
e
d
d
d
w
@@ -323,7 +323,7 @@ f
K
d
d
e
d
"}
(6,1,1) = {"
a
@@ -444,7 +444,7 @@ a
"}
(15,1,1) = {"
a
e
d
d
x
d
@@ -452,7 +452,7 @@ E
f
x
d
e
d
a
"}
(16,1,1) = {"
@@ -471,13 +471,13 @@ a
(17,1,1) = {"
a
a
e
d
z
A
A
A
M
e
d
a
a
"}
@@ -498,11 +498,11 @@ a
a
a
a
e
d
x
x
x
e
d
a
a
a

View File

@@ -38,8 +38,8 @@
dwidth = 5;
height = 14;
name = "Meta emergency shuttle";
width = 25;
timid = 1
timid = 1;
width = 25
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
@@ -363,7 +363,7 @@
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/ointment,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aU" = (
/turf/closed/wall/shuttle{
@@ -681,10 +681,8 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bL" = (
/obj/structure/sign/bluecross_2,
/turf/closed/wall/shuttle{
icon_state = "swall2"
},
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"bM" = (
/obj/structure/rack{
@@ -770,16 +768,17 @@
/turf/open/floor/plasteel/bot,
/area/shuttle/escape)
"bS" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s5";
dir = 2
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
pixel_x = 0;
pixel_y = 0;
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"bT" = (
/turf/closed/wall/shuttle{
icon_state = "swall13";
dir = 2
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"bU" = (
/turf/open/floor/mineral/plastitanium/brig,
@@ -791,10 +790,10 @@ aa
au
au
au
aK
ad
au
au
aK
ad
au
au
au
@@ -803,22 +802,21 @@ aa
"}
(2,1,1) = {"
aa
aj
ad
av
av
av
aK
ad
av
av
aK
ad
av
av
av
bB
ad
aa
"}
(3,1,1) = {"
ab
ad
ad
ad
@@ -831,7 +829,8 @@ ad
ad
ad
ad
ab
ad
ad
"}
(4,1,1) = {"
ac
@@ -876,7 +875,7 @@ aC
aR
ad
bf
ad
bT
be
be
bf
@@ -891,7 +890,7 @@ aq
aq
aq
aW
bg
bU
ad
by
by
@@ -1062,7 +1061,7 @@ ac
ar
aq
aE
aJ
bL
ar
aq
aE
@@ -1094,7 +1093,7 @@ ah
aq
aq
aE
aI
bS
ar
aq
aE
@@ -1170,7 +1169,7 @@ bR
ad
"}
(25,1,1) = {"
ab
ad
ad
ac
ad
@@ -1183,5 +1182,5 @@ ad
ac
ac
ad
ab
ad
"}

View File

@@ -299,7 +299,7 @@
(1,1,1) = {"
a
b
e
e
e
e
@@ -317,11 +317,11 @@ e
e
e
e
b
e
a
"}
(2,1,1) = {"
b
e
e
h
i
@@ -341,7 +341,7 @@ e
J
O
r
b
e
"}
(3,1,1) = {"
c
@@ -349,7 +349,7 @@ f
i
i
i
o
y
s
s
s
@@ -364,7 +364,7 @@ e
K
K
S
o
y
"}
(4,1,1) = {"
c
@@ -372,7 +372,7 @@ f
j
n
j
o
y
s
w
w
@@ -387,7 +387,7 @@ G
s
s
T
o
y
"}
(5,1,1) = {"
c
@@ -398,11 +398,11 @@ e
r
s
x
o
o
y
y
z
o
o
y
y
C
s
s
@@ -410,14 +410,14 @@ H
s
s
U
o
y
"}
(6,1,1) = {"
c
f
k
k
o
y
i
s
v
@@ -433,7 +433,7 @@ e
L
s
T
o
y
"}
(7,1,1) = {"
c
@@ -456,14 +456,14 @@ e
M
M
V
o
y
"}
(8,1,1) = {"
b
e
e
m
m
o
y
t
s
w
@@ -479,11 +479,11 @@ e
N
P
r
b
e
"}
(9,1,1) = {"
a
b
e
e
e
e
@@ -501,6 +501,6 @@ e
e
e
e
b
e
a
"}

View File

@@ -361,7 +361,7 @@ aa
aa
"}
(2,1,1) = {"
ab
af
af
ad
ac
@@ -553,7 +553,7 @@ bc
be
"}
(10,1,1) = {"
ab
af
af
ad
ac

View File

@@ -341,7 +341,7 @@ aa
aa
aa
aa
bh
ab
ab
ab
ax
@@ -357,12 +357,12 @@ ab
aV
ab
ab
bh
ab
aa
"}
(2,1,1) = {"
aa
bh
ab
ab
ab
ab
@@ -382,10 +382,10 @@ aW
ba
be
ab
bh
ab
"}
(3,1,1) = {"
bh
ab
ab
ag
ae
@@ -529,7 +529,7 @@ bf
bg
"}
(9,1,1) = {"
bh
ab
ab
ah
ae
@@ -554,7 +554,7 @@ bg
"}
(10,1,1) = {"
aa
bh
ab
ab
ab
ab
@@ -574,14 +574,14 @@ aZ
bd
be
ab
bh
ab
"}
(11,1,1) = {"
aa
aa
aa
aa
bh
ab
as
ab
as
@@ -597,6 +597,6 @@ ab
as
ab
ab
bh
ab
aa
"}

View File

@@ -7,7 +7,7 @@
icon_state = "propulsion";
dir = 4
},
/turf/closed/wall/mineral/titanium/overspace,
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"c" = (
/turf/closed/wall/mineral/titanium,
@@ -176,9 +176,9 @@ q
c
"}
(12,1,1) = {"
f
c
d
m
d
f
c
"}

View File

@@ -411,7 +411,7 @@ bj
"}
(6,1,1) = {"
ae
aZ
ad
aM
al
ap
@@ -430,7 +430,7 @@ ad
(7,1,1) = {"
ae
ae
aZ
ad
ad
aM
ar
@@ -442,7 +442,7 @@ au
aL
bf
aM
aZ
ad
ae
"}
(8,1,1) = {"
@@ -477,7 +477,7 @@ aS
aC
bc
aM
aZ
ad
ae
ae
"}
@@ -512,7 +512,7 @@ aD
aD
aD
aM
aZ
ad
ae
ae
ae
@@ -547,7 +547,7 @@ aE
aN
aE
aM
aZ
ad
ae
ae
ae
@@ -794,11 +794,11 @@ ae
ae
ae
ae
aZ
ad
ay
aO
ay
aZ
ad
ae
ae
ae

View File

@@ -244,9 +244,9 @@ w
c
"}
(12,1,1) = {"
d
c
o
q
o
d
c
"}

View File

@@ -219,7 +219,7 @@
/area/shuttle/abandoned)
"aL" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"aM" = (
@@ -349,11 +349,11 @@ aa
aa
aa
aa
ab
aC
aC
aW
aC
ab
aC
aa
aa
aa
@@ -589,11 +589,11 @@ aa
aa
aa
aa
ab
aC
aC
aW
aC
ab
aC
aa
aa
aa
@@ -637,11 +637,11 @@ aa
aa
aa
aa
ab
aC
aC
aW
aC
ab
aC
aa
aa
aa
@@ -660,13 +660,13 @@ aa
aa
aa
aa
ab
aC
aC
aX
aj
aX
aC
ab
aC
aa
aa
aa
@@ -677,7 +677,7 @@ aa
aa
"}
(15,1,1) = {"
ab
aC
ag
an
an
@@ -697,17 +697,17 @@ an
an
an
aB
ab
aC
aa
"}
(16,1,1) = {"
ab
aC
aC
ao
ao
ao
aC
ab
aC
aC
aj
aj
@@ -715,18 +715,18 @@ aj
aj
aj
aC
ab
aC
aC
ao
ao
ao
aC
ab
aC
aa
"}
(17,1,1) = {"
aa
ab
aC
ap
at
at
@@ -744,14 +744,14 @@ ap
at
at
ap
ab
aC
aa
aa
"}
(18,1,1) = {"
aa
aa
ab
aC
ap
at
at
@@ -767,7 +767,7 @@ aC
at
at
ap
ab
aC
aa
aa
aa
@@ -776,21 +776,21 @@ aa
aa
aa
aa
ab
aC
aC
aD
aC
aC
aC
aM
aL
be
aM
aL
aC
aC
aC
aD
aC
ab
aC
aa
aa
aa
@@ -800,7 +800,7 @@ aa
aa
aa
aa
ab
aC
aC
aj
aj
@@ -814,7 +814,7 @@ aj
aj
aj
aC
ab
aC
aa
aa
aa
@@ -823,7 +823,7 @@ aa
(21,1,1) = {"
aa
aa
ab
aC
aC
aX
aE
@@ -839,14 +839,14 @@ aj
aj
aC
aC
ab
aC
aa
aa
aa
"}
(22,1,1) = {"
aa
ab
aC
aC
aX
aj
@@ -864,12 +864,12 @@ aj
aC
aC
aC
ab
aC
aa
aa
"}
(23,1,1) = {"
ab
aC
aC
aC
aC
@@ -913,7 +913,7 @@ aC
aj
bg
aC
ab
aC
aa
"}
(25,1,1) = {"
@@ -1057,7 +1057,7 @@ aC
aj
aj
aX
ab
aC
aa
"}
(31,1,1) = {"
@@ -1085,7 +1085,7 @@ aa
aa
"}
(32,1,1) = {"
ab
aC
aC
aC
aw
@@ -1104,7 +1104,7 @@ bd
aH
aC
aC
ab
aC
aa
aa
"}
@@ -1127,7 +1127,7 @@ aj
aj
aX
aC
ab
aC
aa
aa
aa
@@ -1135,7 +1135,7 @@ aa
(34,1,1) = {"
aa
aa
ab
aC
ay
aC
aX
@@ -1150,7 +1150,7 @@ aj
aj
aX
aC
ab
aC
aa
aa
aa
@@ -1161,7 +1161,7 @@ aa
aa
aa
aa
ab
aC
aC
aC
aL
@@ -1173,7 +1173,7 @@ aL
aL
aC
aC
ab
aC
aa
aa
aa

View File

@@ -34,10 +34,11 @@
id = "whiteship";
launch_status = 0;
name = "NT Recovery White-Ship";
roundstart_move = "whiteship_away";
port_angle = 180;
width = 27;
timid = 1
preferred_direction = 1;
roundstart_move = "whiteship_away";
timid = 1;
width = 27
},
/obj/machinery/door/airlock/shuttle{
name = "recovery shuttle external airlock"
@@ -572,8 +573,6 @@
},
/area/shuttle/abandoned)
"ba" = (
/obj/structure/frame/machine,
/obj/item/weapon/circuitboard/machine/cyborgrecharger,
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
@@ -632,7 +631,10 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/mineral/titanium,
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/area/shuttle/abandoned)
"bh" = (
/turf/closed/wall/shuttle{
@@ -718,7 +720,6 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"br" = (
/obj/structure/frame/computer,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
@@ -1288,7 +1289,7 @@
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"ct" = (
/obj/machinery/processor,
@@ -1322,7 +1323,6 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"cw" = (
/obj/structure/fluff/empty_sleeper/nanotrasen,
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
@@ -1697,11 +1697,11 @@ aa
aa
aa
aa
ab
ac
ac
ah
ac
ab
ac
aa
aa
aa
@@ -1726,7 +1726,7 @@ cO
aa
"}
(3,1,1) = {"
ab
ac
ac
aD
aD
@@ -1740,7 +1740,7 @@ ac
aD
aD
ac
ab
ac
"}
(4,1,1) = {"
ac
@@ -1919,9 +1919,9 @@ aL
aY
ac
aL
bA
bx
bL
bX
bx
aL
ac
ac
@@ -1931,18 +1931,18 @@ ac
"}
(15,1,1) = {"
ac
ac
av
aM
ac
ac
aL
bB
bz
bM
bY
bz
ce
ac
cw
cH
bx
cV
ac
"}
@@ -1975,8 +1975,8 @@ bO
ax
aL
ac
cx
cJ
bx
bx
cX
ac
"}
@@ -1987,9 +1987,9 @@ aO
ac
ac
aL
bA
bx
bP
bX
bx
aL
ac
ac
@@ -2004,9 +2004,9 @@ aP
ba
ac
aL
bA
bx
bQ
bY
bz
aL
cn
cy
@@ -2058,7 +2058,7 @@ br
bC
aL
bZ
cf
bx
ac
cA
cN
@@ -2066,7 +2066,7 @@ db
ac
"}
(23,1,1) = {"
ab
ac
ac
ae
ac
@@ -2080,7 +2080,7 @@ ac
ac
ae
ac
ab
ac
"}
(24,1,1) = {"
aa
@@ -2121,13 +2121,13 @@ aa
aa
aa
aa
ab
ac
ae
ae
ae
ae
ae
ab
ac
aa
aa
aa