cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-09 16:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

New shuttle chair sprites by Ausops (#38953)

Browse Source 
* Revert "fixes them not showing up"

This reverts commit 8ffe48a336.

* Revert "Credits the original author + moves shuttle chairs to goon/icons" while keeping goon shuttle chair dmi

This reverts commit 82694bcf3b while keeping goon shuttle chair dmi.

* Revert "ports shuttle chairs from ftl"

This reverts commit 3eb3f741ad, reversing
changes made to bc272c89fa.

* New shuttle chair sprites by Ausops

* Deletes goon shuttle chair dmi
This commit is contained in:
zaracka
2018-07-09 08:17:13 -04:00
committed by oranges
parent 170f67258d
commit 35fbbad96c
45 changed files with 249 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_maps/shuttles/arrival_box.dmm
View File

@@ -78,18 +78,18 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"p" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"q" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"r" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -114,13 +114,13 @@
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"v" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"w" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/small{

4
_maps/shuttles/arrival_delta.dmm
View File

@@ -211,14 +211,14 @@
},
/area/shuttle/arrival)
"u" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"v" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,

4
_maps/shuttles/arrival_omega.dmm
View File

@@ -124,14 +124,14 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"q" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"r" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,

2
_maps/shuttles/arrival_pubby.dmm
View File

@@ -85,7 +85,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"o" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,

8
_maps/shuttles/assault_pod_default.dmm
View File

@@ -4,7 +4,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"c" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -45,20 +45,20 @@
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"D" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"H" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"L" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,

20
_maps/shuttles/emergency_asteroid.dmm
View File

@@ -73,7 +73,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -82,7 +82,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ax" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -94,7 +94,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/item/radio/intercom{
@@ -131,7 +131,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aL" = (
@@ -210,19 +210,19 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aY" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aZ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ba" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -345,7 +345,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bw" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/item/radio/intercom{
@@ -355,7 +355,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -427,7 +427,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bK" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},

4
_maps/shuttles/emergency_bar.dmm
View File

@@ -138,7 +138,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aD" = (
@@ -214,7 +214,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aM" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,

22
_maps/shuttles/emergency_birdboat.dmm
View File

@@ -53,11 +53,11 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"al" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"am" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -87,7 +87,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -157,7 +157,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -174,7 +174,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aH" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/plasteel/dark,
@@ -215,14 +215,14 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aN" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aO" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -232,7 +232,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aP" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 2
@@ -255,13 +255,13 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -286,7 +286,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aW" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aX" = (

22
_maps/shuttles/emergency_box.dmm
View File

@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ag" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -44,7 +44,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"am" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -53,7 +53,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ao" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -71,7 +71,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
@@ -113,7 +113,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aA" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aB" = (
@@ -179,17 +179,17 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
@@ -224,7 +224,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -233,7 +233,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
@@ -242,7 +242,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aU" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,

28
_maps/shuttles/emergency_cere.dmm
View File

@@ -251,11 +251,11 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -283,7 +283,7 @@
},
/area/shuttle/escape)
"aW" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -294,7 +294,7 @@
},
/area/shuttle/escape)
"aX" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig{
icon_state = "darkred";
dir = 1;
@@ -302,7 +302,7 @@
},
/area/shuttle/escape)
"aY" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig{
icon_state = "darkred";
dir = 5;
@@ -330,7 +330,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bd" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -339,7 +339,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bf" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/flasher{
@@ -381,7 +381,7 @@
/turf/open/floor/mech_bay_recharge_floor,
/area/shuttle/escape)
"bk" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -412,7 +412,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bp" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/flasher{
@@ -479,7 +479,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bw" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -489,7 +489,7 @@
},
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -509,7 +509,7 @@
},
/area/shuttle/escape)
"bz" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -656,7 +656,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bW" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -665,7 +665,7 @@
/turf/open/floor/plasteel/neutral,
/area/shuttle/escape)
"bX" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/structure/window/reinforced{

12
_maps/shuttles/emergency_clown.dmm
View File

@@ -18,7 +18,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"af" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/bluespace,
@@ -43,7 +43,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"aj" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/bluespace,
@@ -53,7 +53,7 @@
/turf/open/floor/bluespace,
/area/shuttle/escape)
"al" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/bluespace,
@@ -71,7 +71,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"ao" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
@@ -154,11 +154,11 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aD" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/noslip,

6
_maps/shuttles/emergency_cramped.dmm
View File

@@ -17,7 +17,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"e" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -74,7 +74,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"n" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plating,
@@ -109,7 +109,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"s" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/structure/extinguisher_cabinet{

24
_maps/shuttles/emergency_delta.dmm
View File

@@ -240,14 +240,14 @@
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aw" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -326,7 +326,7 @@
},
/area/shuttle/escape)
"aH" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/item/radio/intercom{
@@ -672,7 +672,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"by" = (
@@ -709,12 +709,12 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bC" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bD" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -722,7 +722,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bE" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -771,7 +771,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bM" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -780,7 +780,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bN" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -823,7 +823,7 @@
},
/area/shuttle/escape)
"bU" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -1059,7 +1059,7 @@
},
/area/shuttle/escape)
"cB" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -1077,7 +1077,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"cG" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,

8
_maps/shuttles/emergency_goon.dmm
View File

@@ -74,7 +74,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"s" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -154,7 +154,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"H" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -201,7 +201,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"S" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light{
@@ -210,7 +210,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"T" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light/small{

22
_maps/shuttles/emergency_meta.dmm
View File

@@ -65,7 +65,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"as" = (
@@ -74,7 +74,7 @@
name = "Station Intercom (General)";
pixel_y = 27
},
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -220,7 +220,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
@@ -314,7 +314,7 @@
name = "Station Intercom (General)";
pixel_y = -31
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -362,7 +362,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bd" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plasteel/floorgrime,
@@ -377,13 +377,13 @@
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/escape)
"bh" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bi" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bj" = (
@@ -436,7 +436,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bs" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -713,7 +713,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bV" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -816,7 +816,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ca" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -835,7 +835,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/escape)
"cd" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/light{

24
_maps/shuttles/emergency_mini.dmm
View File

@@ -40,7 +40,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"h" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -49,7 +49,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"j" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -68,7 +68,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"m" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/light/small{
@@ -116,25 +116,25 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"v" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"w" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"x" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"y" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/light{
@@ -149,7 +149,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"A" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light{
@@ -171,7 +171,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"C" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"D" = (
@@ -218,7 +218,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"K" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -231,7 +231,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"M" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -261,7 +261,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"R" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"S" = (

8
_maps/shuttles/emergency_narnar.dmm
View File

@@ -15,7 +15,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"e" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/cult,
@@ -40,7 +40,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"i" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/plasteel/cult,
@@ -49,7 +49,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"k" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plasteel/cult,
@@ -67,7 +67,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"n" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{

18
_maps/shuttles/emergency_omega.dmm
View File

@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ad" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/newscaster/security_unit{
@@ -24,11 +24,11 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ae" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"af" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/item/radio/intercom{
@@ -67,7 +67,7 @@
},
/area/shuttle/escape)
"ak" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -240,7 +240,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aD" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -253,7 +253,7 @@
/turf/open/floor/plasteel/neutral,
/area/shuttle/escape)
"aF" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -356,14 +356,14 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -384,7 +384,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aN" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,

30
_maps/shuttles/emergency_pubby.dmm
View File

@@ -222,7 +222,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plasteel/darkpurple/side{
dir = 9
},
@@ -235,7 +235,7 @@
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plasteel/darkpurple/side{
dir = 5
},
@@ -253,7 +253,7 @@
},
/area/shuttle/escape)
"aO" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -262,14 +262,14 @@
},
/area/shuttle/escape)
"aP" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/darkpurple/side,
/area/shuttle/escape)
"aQ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -283,7 +283,7 @@
},
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkpurple/side{
@@ -291,7 +291,7 @@
},
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -300,7 +300,7 @@
},
/area/shuttle/escape)
"aU" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkpurple/side{
@@ -328,7 +328,7 @@
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"aY" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -370,7 +370,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/escape)
"be" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"bf" = (
@@ -424,7 +424,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 2
@@ -432,7 +432,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bq" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plating,
@@ -466,13 +466,13 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bw" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -518,7 +518,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bG" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,

20
_maps/shuttles/emergency_raven.dmm
View File

@@ -420,7 +420,7 @@
},
/area/shuttle/escape)
"bd" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -572,7 +572,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -660,7 +660,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bK" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plasteel/darkgreen/side{
dir = 8
},
@@ -679,7 +679,7 @@
},
/area/shuttle/escape)
"bN" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/plasteel/darkgreen/side,
@@ -815,7 +815,7 @@
},
/area/shuttle/escape)
"bX" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -824,7 +824,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bY" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
@@ -833,27 +833,27 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bZ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"ca" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/structure/window/reinforced{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"cb" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plasteel/darkgreen/side{
dir = 1
},
/area/shuttle/escape)
"cc" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side,

28
_maps/shuttles/emergency_russiafightpit.dmm
View File

@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"af" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -43,7 +43,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aj" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -76,7 +76,7 @@
pixel_x = 6;
pixel_y = -24
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -91,7 +91,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aq" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
@@ -102,7 +102,7 @@
pixel_y = -6;
req_access_txt = "19"
},
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/button/door{
id = "bearsbearsbears";
name = "release bears";
@@ -131,7 +131,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aw" = (
@@ -204,7 +204,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -238,7 +238,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aP" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -315,7 +315,7 @@
/turf/open/floor/engine,
/area/shuttle/escape)
"bc" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -327,7 +327,7 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -341,7 +341,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -350,13 +350,13 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bh" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -551,7 +551,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bO" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light/small{

16
_maps/shuttles/emergency_scrapheap.dmm
View File

@@ -109,7 +109,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"at" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"au" = (
@@ -178,7 +178,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -188,7 +188,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aG" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aH" = (
@@ -222,7 +222,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -231,7 +231,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -266,7 +266,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -395,14 +395,14 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bp" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light{

10
_maps/shuttles/emergency_supermatter.dmm
View File

@@ -21,14 +21,14 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"ah" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"ai" = (
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"aj" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/yellow,
@@ -73,7 +73,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
@@ -94,7 +94,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/yellow,
@@ -237,7 +237,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bb" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/effect/turf_decal/stripes/line{
dir = 1
},

18
_maps/shuttles/emergency_wabbajack.dmm
View File

@@ -38,7 +38,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"ak" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -47,7 +47,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"am" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -92,7 +92,7 @@
pixel_x = -24;
pixel_y = -6
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -102,11 +102,11 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aw" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
@@ -182,13 +182,13 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aI" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -352,7 +352,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bm" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light/small{
@@ -365,7 +365,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light/small{

4
_maps/shuttles/escape_pod_default.dmm
View File

@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_1)
"G" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/status_display{
@@ -32,7 +32,7 @@
/turf/open/floor/plating,
/area/shuttle/pod_1)
"U" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/item/radio/intercom{

12
_maps/shuttles/escape_pod_large.dmm
View File

@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"h" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/item/storage/pod{
@@ -17,7 +17,7 @@
/turf/open/floor/plating,
/area/shuttle/pod_1)
"A" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/item/radio/intercom{
@@ -36,13 +36,13 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"H" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"J" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -51,13 +51,13 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"L" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"M" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/status_display{

6
_maps/shuttles/ferry_base.dmm
View File

@@ -24,7 +24,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/transport)
"h" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -36,7 +36,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"j" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"k" = (
@@ -64,7 +64,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"q" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,

4
_maps/shuttles/ferry_fancy.dmm
View File

@@ -27,7 +27,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/transport)
"g" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/pod/dark,
/area/shuttle/transport)
"h" = (
@@ -87,7 +87,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/transport)
"p" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/pod/dark,

6
_maps/shuttles/ferry_lighthouse.dmm
View File

@@ -68,7 +68,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"ar" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/wood,
/area/shuttle/transport)
"as" = (
@@ -137,7 +137,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aJ" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aK" = (
@@ -204,7 +204,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aW" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,

6
_maps/shuttles/ferry_meat.dmm
View File

@@ -15,7 +15,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/transport)
"f" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plasteel/freezer,
@@ -90,7 +90,7 @@
/area/shuttle/transport)
"n" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"o" = (
@@ -131,7 +131,7 @@
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"w" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/freezer,

12
_maps/shuttles/infiltrator_basic.dmm
View File

@@ -176,7 +176,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate/hallway)
"aC" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -188,7 +188,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/hallway)
"aE" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8;
name = "tactical chair"
},
@@ -206,7 +206,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate/eva)
"aH" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -218,7 +218,7 @@
},
/area/shuttle/syndicate/hallway)
"aI" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8;
name = "tactical chair"
},
@@ -256,7 +256,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aO" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -318,7 +318,7 @@
},
/area/shuttle/syndicate/hallway)
"aX" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4;
name = "tactical chair"
},

2
_maps/shuttles/labour_box.dmm
View File

@@ -86,7 +86,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/labor)
"o" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/flasher{

4
_maps/shuttles/labour_delta.dmm
View File

@@ -120,7 +120,7 @@
/turf/open/floor/plasteel,
/area/shuttle/labor)
"q" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -133,7 +133,7 @@
/turf/open/floor/plasteel,
/area/shuttle/labor)
"s" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/flasher{

2
_maps/shuttles/mining_box.dmm
View File

@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"f" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,

8
_maps/shuttles/mining_delta.dmm
View File

@@ -47,7 +47,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"g" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/neutral,
@@ -116,7 +116,7 @@
/turf/open/floor/plasteel/white,
/area/shuttle/mining)
"n" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -126,7 +126,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"o" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -139,7 +139,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"p" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,

8
_maps/shuttles/pirate_default.dmm
View File

@@ -39,7 +39,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
"ag" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -71,7 +71,7 @@
pixel_y = -24;
req_access = null
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -82,7 +82,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
"an" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -413,7 +413,7 @@
pixel_y = -24;
req_access = null
},
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt,

2
_maps/shuttles/ruin_caravan_victim.dmm
View File

@@ -156,7 +156,7 @@
},
/area/shuttle/caravan/freighter1)
"gw" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt,

12
_maps/shuttles/ruin_syndicate_dropship.dmm
View File

@@ -88,7 +88,7 @@
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"hF" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light/small{
dir = 8
},
@@ -104,7 +104,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/caravan/syndicate3)
"ka" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/small{
@@ -169,7 +169,7 @@
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"rV" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -185,7 +185,7 @@
},
/area/shuttle/caravan/syndicate3)
"sn" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/caravan/syndicate3)
@@ -247,7 +247,7 @@
/turf/open/floor/plasteel/darkred/side,
/area/shuttle/caravan/syndicate3)
"Cm" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/firealarm{
@@ -278,7 +278,7 @@
},
/area/shuttle/caravan/syndicate3)
"EO" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/machinery/airalarm/syndicate{
pixel_y = 24
},

2
_maps/shuttles/ruin_syndicate_fighter.dmm
View File

@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aA" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/turretid{

6
_maps/shuttles/whiteship_box.dmm
View File

@@ -137,7 +137,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aJ" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
@@ -179,7 +179,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aS" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/decal/remains/human,
@@ -232,7 +232,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bd" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bf" = (

8
_maps/shuttles/whiteship_meta.dmm
View File

@@ -753,7 +753,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bo" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -827,7 +827,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"bu" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt{
@@ -871,7 +871,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"by" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt{
@@ -1022,7 +1022,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bL" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt{

8
_maps/shuttles/whiteship_pubby.dmm
View File

@@ -42,7 +42,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"i" = (
/obj/structure/chair/shuttle,
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"j" = (
@@ -65,7 +65,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"l" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/plating/abductor,
@@ -75,7 +75,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"n" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/plating/abductor,
@@ -110,7 +110,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"q" = (
/obj/structure/chair/shuttle{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/plating/abductor,

16
code/game/objects/structures/beds_chairs/chair.dm
View File

@@ -192,11 +192,20 @@
/obj/structure/chair/comfy/lime
color = rgb(255,251,0)
/obj/structure/chair/comfy/shuttle
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
/obj/structure/chair/office
anchored = FALSE
buildstackamount = 5
item_chair = null
/obj/structure/chair/office/Moved()
. = ..()
if(has_gravity())
@@ -409,10 +418,3 @@
. = ..()
if(has_gravity())
playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
/obj/structure/chair/shuttle
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon = 'goon/icons/obj/chairs.dmi'
icon_state = "shuttle_chair" //thanks gannets!

BIN
goon/icons/obj/chairs.dmi
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
icons/obj/chairs.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 24 KiB