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

Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410)

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-15 15:01:54 -04:00
committed by TalkingCactus
parent 74244a3d32
commit c38fa1eaa3
44 changed files with 5022 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/shuttles/cargo_box.dmm
+1 -1
View File
@@ -92,7 +92,7 @@
/area/shuttle/supply)
"m" = (
/turf/open/floor/plasteel/shuttle,
/turf/closed/wall/shuttle/interior{
/turf/closed/wall/mineral/titanium/interior{
icon_state = "swall_f6"
},
/area/shuttle/supply)
_maps/shuttles/emergency_bar.dmm
+2 -2
View File
@@ -373,7 +373,7 @@
/obj/machinery/shower{
dir = 4
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bi" = (
/turf/open/floor/mineral/titanium,
@@ -385,7 +385,7 @@
pixel_x = 4;
pixel_y = 4
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bk" = (
/obj/machinery/vending/cigarette,
_maps/shuttles/emergency_box.dmm
+2 -2
View File
@@ -46,8 +46,8 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aj" = (
/turf/open/floor/plasteel/shuttle/white,
/turf/closed/wall/shuttle/interior{
/turf/open/floor/mineral/titanium,
/turf/closed/wall/mineral/titanium/interior{
icon_state = "swall_f5"
},
/area/shuttle/escape)
_maps/shuttles/emergency_delta.dmm
+18 -18
View File
@@ -305,11 +305,11 @@
/area/shuttle/escape)
"aC" = (
/obj/machinery/ai_status_display,
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aD" = (
/obj/machinery/status_display,
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aE" = (
/obj/effect/turf_decal/delivery,
@@ -371,7 +371,7 @@
/area/shuttle/escape)
"aK" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aL" = (
/obj/structure/bed/roller,
@@ -602,7 +602,7 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"bk" = (
/obj/machinery/door/airlock/shuttle{
@@ -675,7 +675,7 @@
name = "Holding Area";
req_access_txt = "2"
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bu" = (
/obj/machinery/door/airlock/glass_command{
@@ -700,16 +700,16 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"bw" = (
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"by" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bz" = (
/obj/item/weapon/twohanded/required/kirbyplants{
@@ -758,7 +758,7 @@
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bF" = (
/turf/open/floor/plasteel/red/corner{
@@ -811,18 +811,18 @@
/obj/machinery/status_display{
pixel_x = -32
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bN" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bO" = (
/obj/structure/table/reinforced,
/obj/item/weapon/storage/lockbox/loyalty,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bP" = (
/obj/structure/table/reinforced,
@@ -862,7 +862,7 @@
/obj/structure/chair{
dir = 1
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bV" = (
/obj/structure/table/reinforced,
@@ -872,7 +872,7 @@
pixel_x = 0;
pixel_y = -26
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bW" = (
/obj/structure/table/reinforced,
@@ -1154,7 +1154,7 @@
dir = 1
},
/obj/machinery/light,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"cH" = (
/obj/effect/turf_decal/bot,
@@ -1210,7 +1210,7 @@ an
av
av
av
cE
cA
aE
af
bw
@@ -1383,7 +1383,7 @@ ag
ac
ac
af
cz
cy
ao
aw
aw
@@ -1674,7 +1674,7 @@ aZ
bd
bi
cC
cD
cC
ah
bs
af
_maps/shuttles/emergency_goon.dmm
+3 -3
View File
@@ -72,7 +72,7 @@
"m" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"n" = (
/turf/closed/wall/shuttle{
@@ -131,7 +131,7 @@
"x" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/open/floor/plasteel/shuttle/yellow,
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"y" = (
/obj/structure/table/reinforced,
@@ -481,7 +481,7 @@ t
s
S
o
U
S
s
t
d
_maps/shuttles/emergency_mini.dmm
+2 -8
View File
@@ -222,10 +222,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"G" = (
/turf/closed/wall/shuttle{
icon_state = "swallc1";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"H" = (
@@ -263,10 +260,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"N" = (
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/obj/machinery/computer/security,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
_maps/shuttles/emergency_scrapheap.dmm
+22 -22
View File
@@ -96,7 +96,7 @@
name = "Emergency Shuttle Airlock";
req_access_txt = "2"
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ar" = (
/obj/machinery/door/airlock/glass{
@@ -110,7 +110,7 @@
name = "Emergency Shuttle Airlock";
req_access_txt = "2"
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"at" = (
/obj/structure/chair,
@@ -128,7 +128,7 @@
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"aw" = (
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ax" = (
/obj/machinery/flasher{
@@ -189,16 +189,16 @@
/area/shuttle/escape)
"aF" = (
/obj/item/weapon/twohanded/required/kirbyplants/random,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aG" = (
/obj/structure/chair,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aH" = (
/obj/structure/table,
/obj/item/weapon/storage/firstaid/regular,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aI" = (
/obj/structure/window/reinforced{
@@ -209,13 +209,13 @@
pixel_x = 0;
pixel_y = 23
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aJ" = (
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aK" = (
/obj/machinery/door/airlock/titanium{
@@ -231,7 +231,7 @@
/obj/structure/chair{
dir = 1
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aM" = (
/obj/structure/window/reinforced{
@@ -240,36 +240,36 @@
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aN" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck/cas/black,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aO" = (
/obj/structure/table/wood,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aP" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck/cas,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aQ" = (
/obj/structure/chair/comfy/brown{
dir = 8
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aR" = (
/obj/structure/table_frame,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aS" = (
/obj/structure/table/wood,
/obj/item/weapon/storage/firstaid/fire,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair{
@@ -278,21 +278,21 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aU" = (
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aV" = (
/obj/structure/table,
/obj/machinery/recharger,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aW" = (
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aX" = (
/turf/open/floor/plasteel/grimy,
@@ -411,7 +411,7 @@
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bp" = (
/obj/structure/chair{
@@ -420,7 +420,7 @@
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
(1,1,1) = {"
_maps/shuttles/emergency_supermatter.dmm
+3 -3
View File
@@ -157,7 +157,7 @@
/area/shuttle/escape)
"aC" = (
/obj/structure/sign/radiation,
/turf/closed/wall/shuttle/smooth,
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aD" = (
/obj/structure/table/reinforced,
@@ -400,7 +400,7 @@ aa
aa
aw
aA
aC
ac
aF
aw
aa
@@ -640,7 +640,7 @@ aa
aa
aw
aA
aC
ac
aA
aw
aa
_maps/shuttles/emergency_wabbajack.dmm
+9 -9
View File
@@ -41,16 +41,16 @@
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"al" = (
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"am" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"an" = (
/obj/structure/table/wood,
@@ -96,7 +96,7 @@
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"au" = (
/obj/structure/chair/wood,
@@ -142,7 +142,7 @@
name = "Emergency Shuttle Brig";
req_access_txt = "2"
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aC" = (
/obj/machinery/door/airlock/titanium,
@@ -159,7 +159,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aE" = (
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aF" = (
/obj/machinery/door/window/eastleft,
@@ -257,7 +257,7 @@
/area/shuttle/escape)
"aU" = (
/obj/machinery/door/airlock/glass,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aV" = (
/obj/machinery/door/airlock/titanium{
@@ -340,7 +340,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bk" = (
/obj/structure/chair/wood,
@@ -383,7 +383,7 @@
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
(1,1,1) = {"
_maps/shuttles/ferry_base.dmm
+1 -1
View File
@@ -77,7 +77,7 @@
/area/shuttle/transport)
"o" = (
/turf/open/floor/plasteel/shuttle,
/turf/closed/wall/shuttle/interior{
/turf/closed/wall/mineral/titanium/interior{
icon_state = "swall_f10"
},
/area/shuttle/transport)
_maps/shuttles/ferry_lighthouse.dmm
+5 -5
View File
@@ -87,7 +87,7 @@
/area/shuttle/transport)
"at" = (
/obj/machinery/door/airlock,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"au" = (
/turf/open/floor/wood,
@@ -99,7 +99,7 @@
"aw" = (
/obj/structure/grille,
/obj/structure/window/shuttle,
/turf/closed/wall/shuttle/smooth,
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"ax" = (
/turf/closed/wall/shuttle{
@@ -129,7 +129,7 @@
icon_state = "brokengrille"
},
/obj/structure/window/fulltile,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aC" = (
/obj/structure/table/wood,
@@ -206,7 +206,7 @@
"aQ" = (
/obj/structure/grille,
/obj/structure/window/fulltile,
/turf/open/floor/plasteel/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aR" = (
/obj/structure/chair/office/dark{
@@ -246,7 +246,7 @@
"aY" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/turf/closed/wall/shuttle/smooth,
/turf/closed/wall/mineral/titanium,
/area/shuttle/transport)
"aZ" = (
/turf/closed/wall/mineral/titanium/overspace,
_maps/shuttles/ferry_meat.dmm
+1 -1
View File
@@ -134,7 +134,7 @@
/area/shuttle/transport)
"s" = (
/turf/open/floor/plasteel/freezer,
/turf/closed/wall/shuttle/interior{
/turf/closed/wall/mineral/titanium/interior{
icon_state = "swall_f10"
},
/area/shuttle/transport)
_maps/shuttles/whiteship_box.dmm
+10 -10
View File
@@ -37,7 +37,7 @@
/area/shuttle/abandoned)
"af" = (
/obj/machinery/door/airlock/titanium,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"ag" = (
/obj/structure/shuttle/engine/propulsion{
@@ -203,7 +203,7 @@
anchored = 1
},
/obj/structure/light_construct,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aI" = (
/turf/closed/wall/shuttle{
@@ -230,7 +230,7 @@
"aM" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aN" = (
/obj/machinery/door/window,
@@ -256,7 +256,7 @@
/area/shuttle/abandoned)
"aR" = (
/obj/machinery/door/airlock/glass,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aS" = (
/obj/structure/chair{
@@ -545,7 +545,7 @@ aa
aC
aj
aj
bp
bk
aC
aa
aa
@@ -786,7 +786,7 @@ bl
aj
aj
aj
br
bk
aC
aC
aC
@@ -955,7 +955,7 @@ aN
aj
bq
aj
af
aW
aj
aj
aW
@@ -980,7 +980,7 @@ aj
aV
aY
aC
bs
bl
aj
aC
aj
@@ -998,7 +998,7 @@ aj
aG
aC
aj
af
aW
aj
bn
aj
@@ -1096,7 +1096,7 @@ aC
aC
aC
aL
aR
be
aL
aC
aC
_maps/shuttles/whiteship_meta.dmm
+3 -6
View File
@@ -671,10 +671,7 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"bh" = (
/turf/closed/wall/shuttle{
@@ -2121,7 +2118,7 @@ ax
aL
bO
ax
dg
df
ac
bx
dj
@@ -2151,7 +2148,7 @@ ay
aP
ba
ac
de
dd
bx
bQ
bz