From 96b620d5402fae09df603bb6ed6a1211310f1e6b Mon Sep 17 00:00:00 2001 From: fludd12 Date: Sun, 17 Jun 2018 12:16:48 -0400 Subject: [PATCH] Adds New Shuttle Chairs (#38539) * I'm crashing this shuttle with no survivors. * comma comma comma comma comma chameleon --- _maps/shuttles/arrival_box.dmm | 10 +++--- _maps/shuttles/arrival_delta.dmm | 4 +-- _maps/shuttles/arrival_omega.dmm | 4 +-- _maps/shuttles/arrival_pubby.dmm | 2 +- _maps/shuttles/assault_pod_default.dmm | 10 +++--- _maps/shuttles/emergency_asteroid.dmm | 20 ++++++------ _maps/shuttles/emergency_bar.dmm | 4 +-- _maps/shuttles/emergency_birdboat.dmm | 22 ++++++------- _maps/shuttles/emergency_box.dmm | 22 ++++++------- _maps/shuttles/emergency_cere.dmm | 28 ++++++++-------- _maps/shuttles/emergency_clown.dmm | 12 +++---- _maps/shuttles/emergency_cramped.dmm | 6 ++-- _maps/shuttles/emergency_delta.dmm | 24 +++++++------- _maps/shuttles/emergency_goon.dmm | 8 ++--- _maps/shuttles/emergency_meta.dmm | 22 ++++++------- _maps/shuttles/emergency_mini.dmm | 24 +++++++------- _maps/shuttles/emergency_narnar.dmm | 8 ++--- _maps/shuttles/emergency_omega.dmm | 18 +++++------ _maps/shuttles/emergency_pubby.dmm | 30 +++++++++--------- _maps/shuttles/emergency_raven.dmm | 20 ++++++------ _maps/shuttles/emergency_russiafightpit.dmm | 28 ++++++++-------- _maps/shuttles/emergency_scrapheap.dmm | 16 +++++----- _maps/shuttles/emergency_supermatter.dmm | 10 +++--- _maps/shuttles/emergency_wabbajack.dmm | 18 +++++------ _maps/shuttles/escape_pod_default.dmm | 6 ++-- _maps/shuttles/escape_pod_large.dmm | 14 ++++---- _maps/shuttles/ferry_base.dmm | 6 ++-- _maps/shuttles/ferry_fancy.dmm | 4 +-- _maps/shuttles/ferry_lighthouse.dmm | 6 ++-- _maps/shuttles/ferry_meat.dmm | 6 ++-- _maps/shuttles/infiltrator_basic.dmm | 12 +++---- _maps/shuttles/labour_box.dmm | 2 +- _maps/shuttles/labour_delta.dmm | 4 +-- _maps/shuttles/mining_box.dmm | 2 +- _maps/shuttles/mining_delta.dmm | 8 ++--- _maps/shuttles/pirate_default.dmm | 8 ++--- _maps/shuttles/ruin_caravan_victim.dmm | 2 +- _maps/shuttles/ruin_syndicate_dropship.dmm | 12 +++---- _maps/shuttles/ruin_syndicate_fighter.dmm | 2 +- _maps/shuttles/whiteship_box.dmm | 6 ++-- _maps/shuttles/whiteship_meta.dmm | 8 ++--- _maps/shuttles/whiteship_pubby.dmm | 8 ++--- .../objects/structures/beds_chairs/chair.dm | 13 ++++++++ icons/obj/chairs.dmi | Bin 30456 -> 32429 bytes 44 files changed, 256 insertions(+), 243 deletions(-) diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm index c3586bd12a..2b245557a0 100644 --- a/_maps/shuttles/arrival_box.dmm +++ b/_maps/shuttles/arrival_box.dmm @@ -78,18 +78,18 @@ /turf/open/floor/plating, /area/shuttle/arrival) "p" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "q" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "r" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "w" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light/small{ diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index 523b243801..08f34e1c23 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -211,14 +211,14 @@ }, /area/shuttle/arrival) "u" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) "v" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/turf_decal/bot, diff --git a/_maps/shuttles/arrival_omega.dmm b/_maps/shuttles/arrival_omega.dmm index 06dc4b7a1e..b8fc632779 100644 --- a/_maps/shuttles/arrival_omega.dmm +++ b/_maps/shuttles/arrival_omega.dmm @@ -124,14 +124,14 @@ /turf/open/floor/plating, /area/shuttle/arrival) "q" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) "r" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/turf_decal/bot, diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm index 12718ff8ff..a4308729b2 100644 --- a/_maps/shuttles/arrival_pubby.dmm +++ b/_maps/shuttles/arrival_pubby.dmm @@ -85,7 +85,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "o" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/shuttles/assault_pod_default.dmm b/_maps/shuttles/assault_pod_default.dmm index b9a49c7d6a..9414fa9f82 100644 --- a/_maps/shuttles/assault_pod_default.dmm +++ b/_maps/shuttles/assault_pod_default.dmm @@ -1,10 +1,10 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( /obj/machinery/porta_turret/syndicate/pod, /turf/closed/wall/mineral/plastitanium, /area/shuttle/assault_pod) "c" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium, @@ -45,20 +45,20 @@ /turf/open/floor/plating, /area/shuttle/assault_pod) "D" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/assault_pod) "H" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/assault_pod) "L" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index a94fd27655..b1d300574d 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -73,7 +73,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "av" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/item/radio/intercom{ @@ -131,7 +131,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aK" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aZ" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ba" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/item/radio/intercom{ @@ -355,7 +355,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bx" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/extinguisher_cabinet{ @@ -427,7 +427,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "bK" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index eaa525739f..9b4776a011 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -138,7 +138,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aC" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig, diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index df84efddfb..d88e15fc94 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -53,11 +53,11 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "al" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "am" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -87,7 +87,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ar" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -174,7 +174,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aH" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/plasteel/dark, @@ -215,14 +215,14 @@ /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aN" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aO" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, @@ -232,7 +232,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aP" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aT" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, @@ -286,7 +286,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aW" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aX" = ( diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index d385cf1d18..57ddc27a97 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -18,7 +18,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "ag" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/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{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -113,7 +113,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aA" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aK" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aL" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/window/reinforced{ @@ -233,7 +233,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aT" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/structure/window/reinforced{ @@ -242,7 +242,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aU" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index f364f84988..7b9e8cfa6c 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -251,11 +251,11 @@ /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aS" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aT" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -283,7 +283,7 @@ }, /area/shuttle/escape) "aW" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -294,7 +294,7 @@ }, /area/shuttle/escape) "aX" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/plastitanium/brig{ icon_state = "darkred"; dir = 1; @@ -302,7 +302,7 @@ }, /area/shuttle/escape) "aY" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/flasher{ @@ -381,7 +381,7 @@ /turf/open/floor/mech_bay_recharge_floor, /area/shuttle/escape) "bk" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium/brig, @@ -412,7 +412,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bp" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/flasher{ @@ -479,7 +479,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "bw" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -489,7 +489,7 @@ }, /area/shuttle/escape) "bx" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -509,7 +509,7 @@ }, /area/shuttle/escape) "bz" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -658,7 +658,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bW" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/window/reinforced{ @@ -667,7 +667,7 @@ /turf/open/floor/plasteel/neutral, /area/shuttle/escape) "bX" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/structure/window/reinforced{ diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm index 6f31726964..3dd4766d6a 100644 --- a/_maps/shuttles/emergency_clown.dmm +++ b/_maps/shuttles/emergency_clown.dmm @@ -18,7 +18,7 @@ /turf/open/floor/noslip, /area/shuttle/escape) "af" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/bluespace, @@ -43,7 +43,7 @@ /turf/open/floor/noslip, /area/shuttle/escape) "aj" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/bluespace, @@ -53,7 +53,7 @@ /turf/open/floor/bluespace, /area/shuttle/escape) "al" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/bluespace, @@ -71,7 +71,7 @@ /turf/open/floor/noslip, /area/shuttle/escape) "ao" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -154,11 +154,11 @@ /turf/open/floor/noslip, /area/shuttle/escape) "aC" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/noslip, /area/shuttle/escape) "aD" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/noslip, diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm index 6bf3ba0f9e..457e23d84b 100644 --- a/_maps/shuttles/emergency_cramped.dmm +++ b/_maps/shuttles/emergency_cramped.dmm @@ -17,7 +17,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/escape) "e" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -74,7 +74,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "n" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/plating, @@ -109,7 +109,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "s" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/structure/extinguisher_cabinet{ diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 926d079549..24d59e5033 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -240,14 +240,14 @@ /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "av" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "aw" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -326,7 +326,7 @@ }, /area/shuttle/escape) "aH" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/item/radio/intercom{ @@ -672,7 +672,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bx" = ( -/obj/structure/chair, +/obj/structure/chair/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, +/obj/structure/chair/shuttle, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "bD" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/status_display{ pixel_y = 32 }, @@ -722,7 +722,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bE" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium/brig, @@ -771,7 +771,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bM" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/status_display{ @@ -780,7 +780,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bN" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium/brig, @@ -823,7 +823,7 @@ }, /area/shuttle/escape) "bU" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig, @@ -1059,7 +1059,7 @@ }, /area/shuttle/escape) "cB" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -1077,7 +1077,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "cG" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index 24f2a4179c..57f0b23d9f 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -74,7 +74,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "s" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/light{ @@ -210,7 +210,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "T" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/light/small{ diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 3776887e2a..faf70072d3 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -65,7 +65,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ar" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "as" = ( @@ -74,7 +74,7 @@ name = "Station Intercom (General)"; pixel_y = 27 }, -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -220,7 +220,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aE" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium, @@ -314,7 +314,7 @@ name = "Station Intercom (General)"; pixel_y = -31 }, -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, @@ -362,7 +362,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bd" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/plasteel/floorgrime, @@ -377,13 +377,13 @@ /turf/open/floor/plasteel/floorgrime, /area/shuttle/escape) "bh" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bi" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/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, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -816,7 +816,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ca" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, @@ -835,7 +835,7 @@ /turf/open/floor/plasteel/floorgrime, /area/shuttle/escape) "cd" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/light{ diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index f8f27ce57e..42650f6fd1 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -40,7 +40,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "h" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/light/small{ @@ -116,25 +116,25 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "v" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "w" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "x" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "y" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/light{ @@ -149,7 +149,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "A" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/light{ @@ -171,7 +171,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "C" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/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{ +/obj/structure/chair/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, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "S" = ( diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm index 509a5bfa6b..9d6c5f1e4d 100644 --- a/_maps/shuttles/emergency_narnar.dmm +++ b/_maps/shuttles/emergency_narnar.dmm @@ -15,7 +15,7 @@ /turf/open/floor/plasteel/cult, /area/shuttle/escape) "e" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/cult, @@ -40,7 +40,7 @@ /turf/open/floor/plasteel/cult, /area/shuttle/escape) "i" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/plasteel/cult, @@ -49,7 +49,7 @@ /turf/open/floor/plasteel/cult, /area/shuttle/escape) "k" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/plasteel/cult, @@ -67,7 +67,7 @@ /turf/open/floor/plasteel/cult, /area/shuttle/escape) "n" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/extinguisher_cabinet{ diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index 36e68e1119..570cb99f0a 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -12,7 +12,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ad" = ( -/obj/structure/chair{ +/obj/structure/chair/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, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "af" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/item/radio/intercom{ @@ -67,7 +67,7 @@ }, /area/shuttle/escape) "ak" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/status_display{ @@ -240,7 +240,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "aD" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/status_display{ @@ -253,7 +253,7 @@ /turf/open/floor/plasteel/neutral, /area/shuttle/escape) "aF" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -356,14 +356,14 @@ /turf/open/floor/grass, /area/shuttle/escape) "aJ" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "aK" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm index 076414acb0..47b891cfd0 100644 --- a/_maps/shuttles/emergency_pubby.dmm +++ b/_maps/shuttles/emergency_pubby.dmm @@ -222,7 +222,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aJ" = ( -/obj/structure/chair, +/obj/structure/chair/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, +/obj/structure/chair/shuttle, /turf/open/floor/plasteel/darkpurple/side{ dir = 5 }, @@ -253,7 +253,7 @@ }, /area/shuttle/escape) "aO" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, @@ -262,14 +262,14 @@ }, /area/shuttle/escape) "aP" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/darkpurple/side, /area/shuttle/escape) "aQ" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, @@ -283,7 +283,7 @@ }, /area/shuttle/escape) "aS" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/darkpurple/side{ @@ -291,7 +291,7 @@ }, /area/shuttle/escape) "aT" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -300,7 +300,7 @@ }, /area/shuttle/escape) "aU" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, @@ -370,7 +370,7 @@ /turf/open/floor/plasteel/cafeteria, /area/shuttle/escape) "be" = ( -/obj/structure/chair, +/obj/structure/chair/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, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plating, @@ -466,13 +466,13 @@ /turf/open/floor/plating, /area/shuttle/escape) "bw" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bx" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium/brig, @@ -518,7 +518,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "bG" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 73b9219f2b..d5ca59c4f2 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -420,7 +420,7 @@ }, /area/shuttle/escape) "bd" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -660,7 +660,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "bK" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/plasteel/darkgreen/side{ dir = 8 }, @@ -679,7 +679,7 @@ }, /area/shuttle/escape) "bN" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/plasteel/darkgreen/side, @@ -815,7 +815,7 @@ }, /area/shuttle/escape) "bX" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/window/reinforced{ @@ -824,7 +824,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/escape) "bY" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/structure/window/reinforced{ @@ -833,27 +833,27 @@ /turf/open/floor/plasteel/dark, /area/shuttle/escape) "bZ" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "ca" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/structure/window/reinforced{ dir = 1 }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "cb" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/plasteel/darkgreen/side{ dir = 1 }, /area/shuttle/escape) "cc" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/darkgreen/side, diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index 795e8ff141..3e5568279b 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -18,7 +18,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "af" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, @@ -76,7 +76,7 @@ pixel_x = 6; pixel_y = -24 }, -/obj/structure/chair{ +/obj/structure/chair/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, +/obj/structure/chair/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, +/obj/structure/chair/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, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium, @@ -238,7 +238,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "aP" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig, @@ -315,7 +315,7 @@ /turf/open/floor/engine, /area/shuttle/escape) "bc" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/window/reinforced{ @@ -327,7 +327,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium, @@ -341,7 +341,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium, @@ -350,13 +350,13 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bh" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium, @@ -551,7 +551,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bO" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/light/small{ diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm index 09603df29a..e95fcb507c 100644 --- a/_maps/shuttles/emergency_scrapheap.dmm +++ b/_maps/shuttles/emergency_scrapheap.dmm @@ -109,7 +109,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "at" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/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, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, @@ -231,7 +231,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/extinguisher_cabinet{ @@ -395,14 +395,14 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "bo" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bp" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light{ diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index cea0df4757..495e8ad2bc 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -21,14 +21,14 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "ah" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "ai" = ( /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "aj" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium/yellow, @@ -94,7 +94,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "av" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium/yellow, @@ -247,7 +247,7 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "bb" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/effect/turf_decal/stripes/line{ dir = 1 }, diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index 25d97e2bbf..34f1661020 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -38,7 +38,7 @@ /turf/open/floor/plasteel/cult, /area/shuttle/escape) "ak" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium/brig, @@ -92,7 +92,7 @@ pixel_x = -24; pixel_y = -6 }, -/obj/structure/chair{ +/obj/structure/chair/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, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aw" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium, @@ -182,13 +182,13 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aI" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aJ" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/window/reinforced{ @@ -352,7 +352,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bm" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/light/small{ @@ -365,7 +365,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bo" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/light/small{ diff --git a/_maps/shuttles/escape_pod_default.dmm b/_maps/shuttles/escape_pod_default.dmm index 14b87a3fa2..8dcccf9326 100644 --- a/_maps/shuttles/escape_pod_default.dmm +++ b/_maps/shuttles/escape_pod_default.dmm @@ -1,9 +1,9 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "B" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pod_1) "G" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/status_display{ @@ -32,7 +32,7 @@ /turf/open/floor/plating, /area/shuttle/pod_1) "U" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/item/radio/intercom{ diff --git a/_maps/shuttles/escape_pod_large.dmm b/_maps/shuttles/escape_pod_large.dmm index 4900045801..49f2f44e1e 100644 --- a/_maps/shuttles/escape_pod_large.dmm +++ b/_maps/shuttles/escape_pod_large.dmm @@ -1,6 +1,6 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "h" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/item/storage/pod{ @@ -17,7 +17,7 @@ /turf/open/floor/plating, /area/shuttle/pod_1) "A" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "J" = ( -/obj/structure/chair{ +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "M" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/status_display{ diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm index cb9d6c4834..f7e717ccb8 100644 --- a/_maps/shuttles/ferry_base.dmm +++ b/_maps/shuttles/ferry_base.dmm @@ -24,7 +24,7 @@ /turf/closed/wall/mineral/titanium/interior, /area/shuttle/transport) "h" = ( -/obj/structure/chair{ +/obj/structure/chair/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, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm index a79903533e..e21bd7c5eb 100644 --- a/_maps/shuttles/ferry_fancy.dmm +++ b/_maps/shuttles/ferry_fancy.dmm @@ -27,7 +27,7 @@ /turf/open/floor/plating/airless, /area/shuttle/transport) "g" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/pod/dark, diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index 793b793531..21f8a58e44 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -68,7 +68,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "ar" = ( -/obj/structure/chair, +/obj/structure/chair/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, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index 989a067efe..22d83d8d01 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -15,7 +15,7 @@ /turf/closed/wall/mineral/titanium/interior, /area/shuttle/transport) "f" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -90,7 +90,7 @@ /area/shuttle/transport) "n" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/freezer, diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 0b1a7c5c6a..0add06a7ff 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -176,7 +176,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate/hallway) "aC" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4; name = "tactical chair" }, @@ -188,7 +188,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/hallway) "aE" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8; name = "tactical chair" }, @@ -206,7 +206,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate/eva) "aH" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4; name = "tactical chair" }, @@ -218,7 +218,7 @@ }, /area/shuttle/syndicate/hallway) "aI" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8; name = "tactical chair" }, @@ -256,7 +256,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/syndicate/eva) "aO" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4; name = "tactical chair" }, @@ -318,7 +318,7 @@ }, /area/shuttle/syndicate/hallway) "aX" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4; name = "tactical chair" }, diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 315c40b8b9..fe9756ef33 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -86,7 +86,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/labor) "o" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/flasher{ diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index 2ad922d9f4..aeb2841683 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -120,7 +120,7 @@ /turf/open/floor/plasteel, /area/shuttle/labor) "q" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -133,7 +133,7 @@ /turf/open/floor/plasteel, /area/shuttle/labor) "s" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/flasher{ diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm index c525a4be88..2f262cae2b 100644 --- a/_maps/shuttles/mining_box.dmm +++ b/_maps/shuttles/mining_box.dmm @@ -18,7 +18,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "f" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm index 68672360b5..920a754e45 100644 --- a/_maps/shuttles/mining_delta.dmm +++ b/_maps/shuttles/mining_delta.dmm @@ -47,7 +47,7 @@ /turf/open/floor/plasteel, /area/shuttle/mining) "g" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/neutral, @@ -116,7 +116,7 @@ /turf/open/floor/plasteel/white, /area/shuttle/mining) "n" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -126,7 +126,7 @@ /turf/open/floor/plasteel, /area/shuttle/mining) "o" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -139,7 +139,7 @@ /turf/open/floor/plasteel, /area/shuttle/mining) "p" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 91954b6bd8..59ce3014af 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -39,7 +39,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/pirate) "ag" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -71,7 +71,7 @@ pixel_y = -24; req_access = null }, -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -82,7 +82,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/pirate) "an" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -413,7 +413,7 @@ pixel_y = -24; req_access = null }, -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 431d5aac61..8f65015d55 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -156,7 +156,7 @@ }, /area/shuttle/caravan/freighter1) "gw" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index d635953737..124441ad26 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -88,7 +88,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/syndicate3) "hF" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/light/small{ dir = 8 }, @@ -104,7 +104,7 @@ /turf/open/floor/pod/dark, /area/shuttle/caravan/syndicate3) "ka" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light/small{ @@ -169,7 +169,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/syndicate3) "rV" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -185,7 +185,7 @@ }, /area/shuttle/caravan/syndicate3) "sn" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/firealarm{ @@ -278,7 +278,7 @@ }, /area/shuttle/caravan/syndicate3) "EO" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /obj/machinery/airalarm/syndicate{ pixel_y = 24 }, diff --git a/_maps/shuttles/ruin_syndicate_fighter.dmm b/_maps/shuttles/ruin_syndicate_fighter.dmm index 116448f4d6..e52b607e71 100644 --- a/_maps/shuttles/ruin_syndicate_fighter.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aA" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/turretid{ diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 400b8f219a..6b56e1a6a0 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -137,7 +137,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aJ" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium, @@ -179,7 +179,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aS" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/decal/remains/human, @@ -232,7 +232,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bd" = ( -/obj/structure/chair, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bf" = ( diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 3118d4e0ce..f8e366950a 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -753,7 +753,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bo" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/decal/cleanable/dirt{ @@ -871,7 +871,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "by" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/decal/cleanable/dirt{ @@ -1022,7 +1022,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bL" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/effect/decal/cleanable/dirt{ diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index c1171c899d..e7cf65a6f5 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -42,7 +42,7 @@ /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "i" = ( -/obj/structure/chair, +/obj/structure/chair/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{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/plating/abductor, @@ -75,7 +75,7 @@ /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "n" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/plating/abductor, @@ -110,7 +110,7 @@ /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "q" = ( -/obj/structure/chair{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plating/abductor, diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 498416f73f..c7ab58f011 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -407,3 +407,16 @@ . = ..() 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_state = "shuttle_chair" + buildstackamount = 2 + var/mutable_appearance/armrest + item_chair = null + +/obj/structure/chair/shuttle/Initialize() + armrest = mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest") + armrest.layer = ABOVE_MOB_LAYER + return ..() \ No newline at end of file diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 137150bcd44c0fb67b8867531b017f9d1fa1306a..9247e3ee9671a94554c743535b7b27dcf09df79d 100644 GIT binary patch delta 9550 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 delta 7570 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 Q5b&d}tgTd}VD|a{05w+Qi~s-t