From d0ccc6753c4ae8b6d6202538d0f39c1089fc4992 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Wed, 20 Jun 2018 23:45:00 +0200 Subject: [PATCH] ports shuttle chairs from ftl --- _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 | 8 ++--- _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 | 4 +-- _maps/shuttles/escape_pod_large.dmm | 12 +++---- _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 | 6 +--- icons/obj/chairs.dmi | Bin 32448 -> 32421 bytes 44 files changed, 241 insertions(+), 245 deletions(-) diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm index d117ca0f6b3..2b245557a08 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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "q" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "r" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "w" = ( -/obj/structure/chair/comfy/shuttle{ +/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 b19ad63eb12..08f34e1c23f 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -211,14 +211,14 @@ }, /area/shuttle/arrival) "u" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) "v" = ( -/obj/structure/chair/comfy/shuttle{ +/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 04f19f60ea2..b8fc6327795 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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) "r" = ( -/obj/structure/chair/comfy/shuttle{ +/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 3309533f354..a4308729b2a 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/comfy/shuttle{ +/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 4574318e476..9414fa9f82d 100644 --- a/_maps/shuttles/assault_pod_default.dmm +++ b/_maps/shuttles/assault_pod_default.dmm @@ -4,7 +4,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/assault_pod) "c" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/assault_pod) "H" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/assault_pod) "L" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 258f9a76d31..b1d300574dc 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aZ" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ba" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 4b0f919532c..9b4776a0110 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/comfy/shuttle, +/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/comfy/shuttle{ +/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 6719587d1eb..d88e15fc942 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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "am" = ( -/obj/structure/chair/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aO" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "aT" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle, +/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 dff9ccb5d24..57ddc27a97d 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aK" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aL" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 d64c28b8b90..7b9e8cfa6c2 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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aT" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -283,7 +283,7 @@ }, /area/shuttle/escape) "aW" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -294,7 +294,7 @@ }, /area/shuttle/escape) "aX" = ( -/obj/structure/chair/comfy/shuttle, +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/flasher{ @@ -479,7 +479,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "bw" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -489,7 +489,7 @@ }, /area/shuttle/escape) "bx" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -509,7 +509,7 @@ }, /area/shuttle/escape) "bz" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 2eaebaeb454..3dd4766d6a9 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/noslip, /area/shuttle/escape) "aD" = ( -/obj/structure/chair/comfy/shuttle{ +/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 aa1b9f0f0db..457e23d84b5 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 256358bbae7..24d59e50337 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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "aw" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -326,7 +326,7 @@ }, /area/shuttle/escape) "aH" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "bD" = ( -/obj/structure/chair/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/plastitanium/brig, @@ -823,7 +823,7 @@ }, /area/shuttle/escape) "bU" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium/brig, @@ -1059,7 +1059,7 @@ }, /area/shuttle/escape) "cB" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index 6f31ce1d40d..57f0b23d9f9 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 29b8661ae29..faf70072d34 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/comfy/shuttle, +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, @@ -362,7 +362,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bd" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bi" = ( -/obj/structure/chair/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/light{ diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index a0b6ce6db96..42650f6fd1a 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "w" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "x" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "y" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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 aaa9c861cef..9d6c5f1e4d4 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 0debf2ad0fb..570cb99f0ab 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/comfy/shuttle{ +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "af" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/item/radio/intercom{ @@ -67,7 +67,7 @@ }, /area/shuttle/escape) "ak" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "aK" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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 136cabe9db4..47b891cfd04 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/comfy/shuttle, +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/plasteel/darkpurple/side{ dir = 5 }, @@ -253,7 +253,7 @@ }, /area/shuttle/escape) "aO" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, @@ -262,14 +262,14 @@ }, /area/shuttle/escape) "aP" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/darkpurple/side, /area/shuttle/escape) "aQ" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, @@ -283,7 +283,7 @@ }, /area/shuttle/escape) "aS" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/darkpurple/side{ @@ -291,7 +291,7 @@ }, /area/shuttle/escape) "aT" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, @@ -300,7 +300,7 @@ }, /area/shuttle/escape) "aU" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bx" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light, diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index edd86c5ec60..d5ca59c4f2b 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -420,7 +420,7 @@ }, /area/shuttle/escape) "bd" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/plasteel/darkgreen/side{ dir = 8 }, @@ -679,7 +679,7 @@ }, /area/shuttle/escape) "bN" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/plasteel/darkgreen/side, @@ -815,7 +815,7 @@ }, /area/shuttle/escape) "bX" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "ca" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/structure/window/reinforced{ dir = 1 }, /turf/open/floor/plasteel/dark, /area/shuttle/escape) "cb" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/plasteel/darkgreen/side{ dir = 1 }, /area/shuttle/escape) "cc" = ( -/obj/structure/chair/comfy/shuttle{ +/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 d0b8f7ca80e..3e5568279b3 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle, +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/structure/window/reinforced{ @@ -327,7 +327,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/plastitanium, @@ -341,7 +341,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium, @@ -350,13 +350,13 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bh" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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 cb2b7517b5a..e95fcb507cd 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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /obj/machinery/light{ dir = 1 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bp" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/light{ diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index 0dc057963c7..ce8842a41b6 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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/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/comfy/shuttle, +/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 9bdb49064f7..34f16610204 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/obj/structure/chair/shuttle, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aw" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aJ" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 c2625b0e57a..8dcccf9326f 100644 --- a/_maps/shuttles/escape_pod_default.dmm +++ b/_maps/shuttles/escape_pod_default.dmm @@ -3,7 +3,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/pod_1) "G" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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 6a36801db92..49f2f44e1ed 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 "h" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "J" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "M" = ( -/obj/structure/chair/comfy/shuttle{ +/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 36a54e54bcd..f7e717ccb89 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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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 432791c9367..e21bd7c5eb3 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/comfy/shuttle, +/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/comfy/shuttle{ +/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 21d3bd3413f..21f8a58e44b 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/comfy/shuttle, +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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 334df92b557..22d83d8d015 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/comfy/shuttle{ +/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/comfy/shuttle, +/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/comfy/shuttle{ +/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 b1feae232ee..0add06a7ff2 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4; name = "tactical chair" }, @@ -218,7 +218,7 @@ }, /area/shuttle/syndicate/hallway) "aI" = ( -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4; name = "tactical chair" }, @@ -318,7 +318,7 @@ }, /area/shuttle/syndicate/hallway) "aX" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4; name = "tactical chair" }, diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 636458a64c5..fe9756ef334 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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/flasher{ diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index 6df69ba0f64..aeb28416832 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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 8 }, /obj/machinery/flasher{ diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm index b7354b8d894..2f262cae2b8 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/comfy/shuttle{ +/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 99bdb64aaea..920a754e453 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 efd49c8908e..59ce3014af4 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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -71,7 +71,7 @@ pixel_y = -24; req_access = null }, -/obj/structure/chair/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -413,7 +413,7 @@ pixel_y = -24; req_access = null }, -/obj/structure/chair/comfy/shuttle{ +/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 aa42b30b9fd..8f65015d55e 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/comfy/shuttle{ +/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 696a99e30a1..ac9a2cd680c 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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -185,7 +185,7 @@ }, /area/shuttle/caravan/syndicate3) "sn" = ( -/obj/structure/chair/comfy/shuttle, +/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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 1 }, /obj/machinery/firealarm{ @@ -278,7 +278,7 @@ }, /area/shuttle/caravan/syndicate3) "EO" = ( -/obj/structure/chair/comfy/shuttle, +/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 a9cf2a45b5b..1f8c2640799 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/comfy/shuttle{ +/obj/structure/chair/shuttle{ dir = 4 }, /obj/machinery/turretid{ diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index f7cd8ad5293..6b56e1a6a0b 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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle, +/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 9888026e31f..f8e366950ad 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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 11214ef2607..e7cf65a6f51 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/comfy/shuttle, +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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/comfy/shuttle{ +/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 a4915f6e1fa..f2bb6dc498e 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -192,20 +192,16 @@ /obj/structure/chair/comfy/lime color = rgb(255,251,0) -/obj/structure/chair/comfy/shuttle +/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" -/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()) diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 10fa8e70b858f8c9f96f1b8a00bf9135d49b507a..b302f4f749f792e0c230b75ef510cdadbd9b5c88 100644 GIT binary patch delta 9580 zcmYkCbzD?Ww7{2=?vO?SNeKZ7DJ4ab5Gko8q?Zs}noDz|DEM#WXW0I<5TPCE zesla0a(NP5Ee25MF){_+@NY$>a^kFksx zm-S15`ppg{*amN@z>g}mKh;VVtD?o;`W8*s+2PBzB7Y7+QO)Ue5ts2sH1{CXq)2(# zD74+B=S)Rdm}$GT)^4do_YdOCij|tQLb_L;v)Acy!{CGREW&c(+CWahm#o{y>@}K| z3kAfxY3&?gKX)W8yfZ9y=t$M(CSx5REHUu>C`@18Z5rtlJwuj~^CUGUTOch?P9$2x z7C!}8m~A`XGk;5Yv>Rkw^9sw!5C|@8tnj^IF)T<-NWfK~(qsN}@Un$w*D^APPh6o> z(A0U#>b0ZG?zdRs6!z!FOVDHy_z0s56lToD^-_w`YWi^4vE_bz6swnE&yoU_zdx1ycvp!4rMTqO5L z=B%)&2=|i~0c6#5+3#$T`{aXU-Tv9>FaehM+hE?s-Yz-Ot@bQuM5Go^2nq$?U20`w z5_fFNeC*(IvZ<}BHI@iA6spEs3}!x_sWQib?=QuIav=)$TQ1hK7%b&KPA|VFQUEM@ z8Q9(Gtch2OMVYZg^#IS)Nqrm@N?jixX>q3o`s2T5wYG_DCbd5cl%p+_4kEd8pSrn; zLb@XJ?|!A>MqRaBr{a3*EY87on2i=={j_b!8Bj?yVrBEF_3_pe z#z_NhJ+}oo5)%_Cbsl~0aYsb7u#}6u2xg8LFVVCd%9aWnmOuZEqu*rvmi9DG`rmW= zXi495;X8Nki11nT<9@4no<-()agAXx;ab}qEkvkneXSBgqqB&r;7WHF->_Ha=H;=i zt;BZSjfg6aV0z!M#rbYT(01=Q`{u-zp6+cs+o${SD*GAc z%=Fi0zvD_!liz6dzLCP;t@JZ*klDvIdw z4QV={AMEboQRdMqb;F&i?q+*=Evn}#Mip0Jg63#Jk7W2={Ag~rWOt03X{E1ywzs{P zp?sdfNx!ARW!fK^i8BPp@b+Ul7&g6sK*lB)lbOi~>1H*}3X*hP#nr1Y<`uhoDrNA3 z&~_(gkTv=qGZ_anSx*uBiTKH|kGHqQ`;Hhux^^F#TuLJ$VV;w{F^L(Lf&zObGWaA0 zWjBwHQ0}>3n5b4$s;3foSIy%()TM03p;p8Y zdiwg(xfEQp5n?5K;BOpZy7r_bs)_08em#}W3s@dHp>!utE1)h{hMCL~3caVI1)O%2 z#YSzl(gB;KsiN^RIbxd%FV+9xY?zn7O&P^AaHy#!W$~si`3f zN>>D-3Os^>^^=Gx4SoH)_6`ofZ7;{!YP|kb0Uek_{N!1u5EvgfA=udi(L2s@e>OIH z2rD993qu~ggW}-exc;@N&B+e<@1?<+%h(80n-AsNIohwy4JXHk+*efpdw6wJL&DL!0dvMB*$_9s@;yKB@AIi3d zlzeaYoA>2(aZP>p9)B~eQK7}+o}nb;SAgA#WQ+Wmab8^Gckjcryd9YV8y-0c3Fqn2 zn;&=)Wj!B`0;jHN+<~ZM@e_?`SIv6FjrF)T6{pf$N*C-aTn%x413$l3W};B$`A-P! zQAF0@&$9h!v;PuM>AjPtB_%fnPi-8v4~?AL*1Gg_iCzWvs>jF2mevi`mU$e|M^+e& z^Tv8Y4nq2S^1%Iw>ST@EzV-MPn{J4ZQT(NT^sB;8Bf!^sJF7f3QtHDi&B?be{*_W2 z4Su36oBCsc^pRtvz3e6uv=nct{MxAZs3{}4?K|y|^gaieVJm(@JWqFb8qhSdvaN6H@}pT#l^*Sle&-i^KO1eA>m5|5-3$w)yd1edXp>Q%JL~g_6n*_ zv~Lg!NbDoCnA)1*dqj<1H%+*SYARziT~W0B2Sd{PlJ>qoqi7XUH(clNDN$FogFLo7 zfqS`Wz4aNp+#_>ynFj$GRJryL2n(B<(z7>%SrYw_Dw|=wttyzZ`&5xo5EgQ%Fg4ue5KHD{qEDyuh~>&r(u{?(NNi$ZAUVOx z%%T$c$A4b)Bk8D>MIJZ%!#4HTmvqmNdnJ8gJR)B!sab}wL{p!`-THU3oc-r*#?oGS z2&CEk#Y@Pdj^$>Px{Mpiio@ttXgNDA(X;iibzANFVImxuK)$6ON>iQA%dL@vNuqkz zYBTHKTfzO5_X%0a!Nsp3FN+~S)O!oOaRIP*LiGFm`aG~9=QWx5V%@@sO2PHEIhM8K zN&^8JmZv6gn`aaiaTpmHSM`eS9bP@cHVEIW2=!W3O7HS8Hx-*P!Doy|tHrbpA3bW8(ewrB~-(n)OoH=UP;OG-{b&I@zp)6Kn z%H6JZ>oC_I4-XF`r}_6}Gf|o03irR6w$6*sPq{CLn$R$y z!2EG0O@>dgEtQs1dI7X%pN`P#hFhf1i4ya;Y77oWQHxbC)v1(ndt_}}5@Z_8hAJQl<+!~lsrpNI%hZ3Cdm(3iDbB4hQzf9 z7A5jdjDHxDtFL-D;v>J+XkPQbe@^c1?q7x%1><-bVLH1p><`LSzMUc@lriNj~RL!Izh6LI?g5 zLVS#!8!4>Z5n`GWxx}=Vp0V@Fdh#0#HsNshCAK3??f5#GrPZ#a`mF3ytT;wjnbVW=5Nt4Woj-$KZl($ z)Mg;buT^=xo|DtnM%ddn>THBjLrvR{qTsOyeCSsba4_JFZ@#JgRKT~eUA~tX z=~BLNijLJ##pqFbUF{<uT%eH}2WHnW*NR(EeWtT}uD!iwz)jZdy)b za;KyozBh;0W_YovqbVD@*z6%)e-r+QLHfaizx9Gi1_r#eQ(|1}$EwI9o|`gSGmg!g z{hwzOFXkuAs8&F>6(Qrictk9-+@IsCi(&jH<@WtB&jaqrh&`Z$K2hnSFp<^O)peCW zE?HDZCc2HNZ1&(uVc9#Fn*vW^S?pI}$YpvDGvw-+nmT=jfnh_brxdXlUGvu(Y4kiK z_701!-L@>Zu`h3FQIE>i>#_hRCwVz8OIu@ghINkcWx`#fCIv3aJ7S55z#6p)GY*3Q z1|2Soq6`gGc>Lb$yV6X9pHqsL z%1}scyA|AT0c?lLhzKg@hj1}^2c_};)9o7W82CX!rPxmkMMcF0#DkZqGnqk&k?dmF zs8Z9ZGW4qYcV}AU&c~~vNDW+!za)0~LFQzmpkXyGI4x$<`7T#nV>2@$hyJJQs@;=9 zt-oGV*elN0*OOSi-IvlNuD+^wRw=DOnq0=w)XXA)<;vJDkKUvQ_Sb14(|ui{>N2S| zilTG337}9-nt{XudFk}>*~x=@6QGI^YfjPaLL<%H2EUHVo&A(ZipbA%h`iM@fpVfy zg)obkI<@al9LW253C6c5oTCB|B)Akt;Uzia0ew%YUg7iFhlwEfsQpcVl5>{wcgcQ8 zGk`dts1q>s%%QY}!Rp+hKhz0^sH?L$j?helKOy&47CoeUYOV&h@z+Sfy5F2WjFPyL zut%6=jrw65NvE(}JN9nSk01HQ`ZfS!%JKWKaE!D;0LyFryD8F70zTdUd#F^S=?BGc z6CN_hg8y1;XYA~u{wXI733DYUuEOze0$_!g#yfi((^019;_8OjtHsDvGZU?o(Arts; z$Ui8SHFG;zz^%*~0p;&oTA7{i$fuo^8-KcvwAGKU-@AK_9{vk90K=Qa!;Qh9Xn>;& zBo$Y3)T+Oh$J9xKEcFG}!;jcJecHI=uX<{4JzTIaaLylWfxnOvrZ&%I&OBsdB8J#KgK@5fqvvy0a8C)2&BRn^T#+O{9TLJ=5D*n~Zk(-*SqADAYHjB+dLa zmUO_b3j|1Iht?P#2o1K7zDjic7969YW*4RRZiMKw(H8;xW}QCmjkU*b`J_$gh^^8c zLsTJ{YC}Tg?*Y&@{`OTAVUY+9T3Q6U%+W+@YMO8H%EwiZf zYMu=y@0CFlX5IqD%=_K@>Q!-yJ2#hIXX&L(5)}dvw(?N7N_0OGozB`8uc@!o7U~pM z{|q$@7?-Uqjfao7BEfA=#hc-od)!gBDWN^j!ouQuwe}_5Jl(w~3F1)L50+X*#3#id zdq6a+mx*UX_14Z>t7RaNVt>{h3Au{$^2y0XL*$+)$r=kGUV3Wb=gUex-&mgJ2LacB zrqu^K_e2A`Ec8qEg|V?!d)EQbpJc?W5P-iGb4@AT@9C=?VN9SF=u$aRAj`LW3->_Z z=$1{@q4>X~cA6Xfgn~mPPJ>sK_Sc%_YS7x6r3l?R-bDQd7=nTHuUa=qhIxgAJYWsw z<&SSQfxbka`U6A^u(`XB3)vK9b&q4hI-0-r%)?Z0JGCFkPW_w5pb`V%Vhdwg^YQV$ z^o;ndV6C%5e)IoQUVdDQLsX3A{=BM%BjiC(3M%KCCYe*Itj$|=L=v4^f= zvAwRV4#h~g;k+-;K|hS?uMb>o-v0R45au0aq1$EsFjs9||amOG4NP2|4l1miaI(5z7LZHsBu)! z-bzyZ0zL}MJPCVR5yG2%EG$#%SON>F*7R9ON6Y_^Ki;juc@Afm4u}j&BfAII+xE?h zB%SIqnT(eEC;Kw_m%HNgxm&2ZJ@3;@kT_v#FLW%mDzZPzq`u3)LRv%nQg|T&D=X#` zgNS_Ac@MP~Xz?6kD))(_;!5X&E=)>kqcNX~}>}Z4b zHYw68$aii4jGNohQ0-T{)n=e6cqSH&P2T8)Rv-x00md)c>vB|e7J#GU05yOyB@$}a zr6B3#EV9T<^0*pa_ELdl^dkoA%;0whvsV@ajxl zic-*;Q=+8tt)c#3-!JWnK2R6n#rZwRw_^;x&&2SO%bp~V@JO@}5fhJ2P8LV)|N2Fc zwC8j2H_hau6T>X`VezHtEE6j$oyEor0u%r*`rIW-4&74qf zM&5UloSSaOm=~1)D+RR`?*TI8>mwefx)RN2S|NOW*R5wu{KG=60q<@^GlOQ%gkBIS zoIpwRrJ$MLBo}RRZ0Nh?0wGnqqIb34P_z-N#m4%}{M1e{lbP1N45j#iiuLk6 z?F(X>`*jX^U1#k=`uE>(&sJ+P%M*rdbJ}9qy(OzTu&)2s$5z9`&Ntp_{{9$S_L@&= z7czq-yrc~n6QrbJC2Hp%Tju|G-SM6Jd$ECjrD<$d=E+Q?(;NL4o0kSs4J{9!$Op3w zp;UxDo6KnCno(-L_(ErEj+Ix8OJmr|zFWpHGo`314lIO?sv8tz@^SmPC-^bNBTS3# z3>KJYT1pf|nP&KrQTh7?M+Uu}d=khn3(@tbCU1ba$M&6s!D$$l`4YFig1gH#t(24Z zBf4FQEI?XqTNa)swS?S)d>cm^;(Tv~WKzwZZ?#YNL8Z?J&g=6}4t;Wr*Du*W!}J#*>c>OhifL!TJ_eTui zU6(+SO2@-XT7DJ!z{J3S%0XU)anMAX(yWg*{8gz0xacYu);E+>*HT`74E$~WouJOA z_0o{y)u*2tDYi*0#S{%)KV85J#dq^*+d_|1CbldzrZWA} ztD5{bfnxkSO}lhPxWY0%j8Rdjdjpd*f1A>|$f8y=8H3+17X!ADY2puDUE4O*@wi9x zSz(;tVy)xziXtQ~_-HjkwU_bt>a7x+SZ?|9=-o!()Kic#a1rYCh$c6QecfGYDgB9s zR-9?7;nH>M)Y>9!M?K5)|1ExUZ;PL}k|?Y60UM2vNv8Q!!W_0{=5j7?52);|&25+|Wq$yWI zuotGL7{8Pe_r>EokT?k3zFwm|upy}rfyhPGjYe8CID}+PNSd6-OKb1IbZ-#6)cMNp z-=i62@+17Hs&{wzYt)=a7Usd`9q4(I$iQ1-*~$^6UvRa|AOmDRjYC!z4q7Cw2VKZ- zK|}kKcu-b4;FMUe*CA`qBML13LEw|uN)$dP;AJnik67dW_)90{96Sy_TDAr_u4~=> zcL%mOX@A!ZhGQca>a`Iz;jIe$9Mbz~$}waX_)r8`F(tovK69drb>g;6yaFC5MOJ-W z%dXv@E&Vm85pAlL(#smup1*7YrC&a<5+rzGI-a-rA%z}9Jk|=fx`k0X+ts*}4fsqW z!xUjIransQFfGsbvZ=QOcpSCB)5R~;+Qv&BW1Y% z$jL}8#y+^2BUvN6nD_Ba31sslCU5)7G}<@)*vnvJR_cw}j)`HMt^nQ$W@yK{wcb7a zBcWe5pLfyT4#fD%lC0r%;CX_+-FAytXRin37Z-W$AjHGM!ymotqZ$4DT7i$HEqU2E zwioZ>SAT!!%nW_*<+{D^v9$bvBqi73pg_9)c_so4+$`=3im1O$n394*B+q(?+ZyXy zK&)aKRlO3Dxm$!drYp>otOVOQrn84%a{o0|26DxCt&MWU2#4h^Ai19Fq`D#HZ-O9g zfjIJ1d{eQpW(_GskqbPyk^428a?tb4Z-_f#z3>oX7cgvc&4^@<>eT347NS9F)B*(V zKQeN7xQ9~-eC{J42V=v_y39d@4Ss!wnGYzFIeAq=fXhy#ruWd**)n$v8{}X-4*_JH zq<>gGui!&OX47^Gv#PX#EV7)k&otxva!>LnCzY{8&zyM@r}=z?o_Wt1x%r|5A{yyn z%uoYtzd7zBNz9gV<66J?{Tn)P49K|9H{t1g-!m#R@MY-6&LwcM!x|a;98n1;YEpl9 zvC-$U?*8rka`NuY3%^TeB)TEp52)D~=uW(GsrTL9tfP!k$k=^@IhIA{L+IHQo!Z}A zt_5~B`hMy^@Z~)#JvhP1FA`&9LJI1X*RZ~jhWe^+mEEbC?h>YE`GmbNL7(!HH~=4M z9NOL=1xciczGoOW`HD=Oa{p%CPv+n^j_bT;&Xdq4w~g+IN0637G*g>E9`GGz^YA@O zCEJq%xoJHmNZaWz9xk<~;Ls@pU&I|d)zg)qUYKw^_pRKSdZdZUq_<}0P!EXhI&*Z! z{q%%T07luf!$o@PQTXK>5u|D@6u=8;6q16dkCi8jObEeWrRbDs%+CD_vGI4IKw=IQ zPcNF5qCGta&AKnMxhYNc0FM%Lrajma2|T~=j%f4#)w<^b=DjRcJMqm4a?O;wQ<$hj zhXTD&36e;`W1-j>lK!tz==DF{I)M`T{+lJ1(oXtCl-8@}gDFUK%!c>}U(Um4VmrC+uP43B)Ak}(S2$cDPsy3c| zCGBj#?N4vt8%K>&Y?_t0K@To!bHCj5x$k_Ei7U~dT9%>NWSaydVOmX@<2&_!4j)&f z&`dxwm!`HdU_ir(P(j7eH^E7z5dcBJ5o4`Vm=stKcO*h~N>U#RXgSqq5W>#a->UhD z7*uCKE(Q`fJ$&F|ofWEjXhZL0*@X!h*Czuvm{N>A@q-3t$o zc(msh%VS%ZW|eq+T(QSQSN47?$IWQv(i@ILhRsRVPnQE+SnhAJusG?=|NJpeDw51_ zw*tUX%iFCF-=+VVp@LGGNf*B}$L9}y-8#eOSqji~^J2?wYn`oQoW?%ScK_Ec)EwK_+Axa@CSsvraaB zgjm`?B>&3oyRLUcXFd^$|Cwe^WoZ;Je8wcNfrrjg|JpH}y#wNgBLDS|uR0|bK>z2; zuk0jUX`ezdl`C__OX-(oMqkQ<>_pdg?aJ6|SEGNi9rV34cIp<6ta{icO3$u)=8D^m)?4;>tJ`P~+eZFbSO{A+L! zW2tohPpDhd$shHH;cvIev&5>TO5iexT{pzph#n)iAnx{L2|bDIiP-OsWjZ*{yAh%@ z3sVa!Cji;-CE?#JP0A^|ud+mc{`^Ge~uszYpdmjK+J#uF;SCPx+&jxQI zc5pg{hg@W+Dvqr2l$Ialzt$mrHq6h>-(xpU=TvpnRv*DU0o;E`t6LX+EfpR=0JnB$`(EwMTt>y&$)!s~z}BcZ+&DGx&GmBMoIre)!V zlTu@KHPtN^RK*p0x5i5>!QAGm7$Q1|$UQoG|2!$=uGwYa%Bk=6S7aJLKYz&F#A`#t zz`nj0;H`xR>7G1lrtrO&SCb8jfotA{2J7x!zQ=7VFWW9Pd;S$}&}I_MlGfFkwPBE6 z%SV}3!0o&yFPKDT5sQeE(@jveF>v(iM-!nv{NQI;vXetbc#whillUl(!-@Y1qta63F#g{Qt7YY&_gMm!jJ>+ z@_TRn-+Qyx%v$%}IiGVrpSwSM?{jBL&=@^vjHJf^i=V#n2W1;i>-P@s9~|6VArPPJ zoRnV2J}6X~Z8=cV^_-0YDksyKSyrc4U#5vQ$%!=$N*Wb&3RtG@HybY};m zypGx($RD__9sXKtC}wjl!)Ky#WdiKZ?uyY*Qgae!kF6eaSv*OetJSwPCFNolC;sj*?C^&)2feBHC(g$|Tt!>Po>XTsR0=f)KNfiPXvdVT zL92GLkYF#pmpx)&U&6{S(^`+3=*9f+_$ul{Lf$2vQ7x2d`RLR0yGjzSPZB9sfYs?K zVb|%t(=5|VuJg}V*tQlD>>FNgTk!!e{aM3h zRHA)!B#}-d!_(sTMX6jFNq$5+p}%{@g<*0 zafg@77u?&GhjQ`&AP0FDl}}SZ$%#Ts-=#gc*e=U6grk~j=Xi__Bk4X`QR&$k*5FCd zI?;+=4NT&FMW%fnS5F?m^FOgB-1#XW<`re_J{`tG~_^HfeEX(#)37sYi85+@)b> z{BAqPDw_LCkm>v?4T@Ubt*v)mdbVxzvouv@Huj&JNzg!3GHyF}T%dE?Z^imhdvRo) zeFrKi)#4lONWtv*6LVmY#{|GO7L+aIe2>2Rs3%m4IQ6CTka}&CiX%z7IiAy(h#_*tY1XAlzmL)bsL+ z3Iz>~cqgswpPc@M{47*o3aIodYT`_{u4u5#-U8&b2^iPb$k=~*Ggx9T?}Ystg~@H| z27 zuFiHdva>(%_ct{)y#{U=pc6QB%*+VCF3DTYbStOHi>s%G9wOukoo}z$JFliPmjc$; z*Bu^-`RPf_2Xjid5{6Jkl2h}%iWO>}MCaIMd%1y< zi5#g&Fva~r!PA0<@X>&_TUGIYGUtn-x3__e(mtf!cj!YQF|mjyCq!XoCI0U3>V_p& z5gD2I-rn9SMddTx$iDK*%6bF1y`8f&A$S?+>kWNa=YQ_H=s6+t#pT!-CUaANxOq9j z)6@3a1GcFK!Y5+ory4d^QW}n!q-17tpz1;eS<+|mN-b{+mnc-xl>K~>FnhXg*R2Rs z;iE6fPUi8bD%LrFgO#_n`Y-Jjtl$2< zV8JEd_`Y1i-1xKp>{1~%F+|e?(2amkSuN^SB9P9{UWSCJQDSgTvb)!q^tQLRr@Bk* z%@WU0sm&}o3z)&){;x7Esn`XHXSP`s-(wloe)c`l5g++Z`uy*YpG^FMf?8QiKNDc6 zpg-C>2&Cp_Qck;6UCLL5B%89NJ&{bGK`b zwX;Ilg3Qs83SBY_sBnq>QKV# zzN3*D*ifndfh}%s$rr_J@DR z9F<^8$4v`Ccln=}&RyJ|cMF!7){^DXfBNw_H}J}V*{SbcsMIR$(1wydy7}9)mAqT`b+9qiNK!&U2WSv3W~6nXOMs${ z&RntuU9*CM`Fmocox@>?z<_|o_j761J%-cLpwhoVUZs`cA>F#p(yVL-^lQ^Zk4FLv zvVrf18DEj8O$NiR7nyZNCma|CVLu4OI$G3NIByFr=3L&pVe#5{fBeYp;^H#ze-hH* z5c~w=0L&vU&8yTV3jmHdjoY9=(Ck;V#F1mSSHZitgy@00`D&I6q|05+cKxq5xR21> z`SnfKY76ew(y4Z~5@PC37NXW=f*O@5H#G zSn}Jpgasm|2F$(Qu<+w9dmnMiqnUEU7;l=jE0sJ5>`!#KG;hpm1wXLPx5SM81Mbl0ypW^s1cDL*06QfnIfILn3#-`|O zp35(Oy`;$IEV3nEEQo6RaQvk9lNrOzs}aohCNv1ZXh}(j45`Rv0>-V`{3KkgkTSQ) z*>_)S$@qHWxc^Q4;(L5;IGipKtH@3)F-%3Bq|kiwBFspDa3!=@JmokES1%GZ)+Tuh z*kr~HjbB<|*s9NU19E=;{$zwW{6l1CIfl+i8P%NNw%IO!agfPShe*NdM{M!&@z^Q! ze^rK+5{*K?7zfemfkQCL&882QI_lhzvNx!fZqXaoW$+%yz<>R$#vSv%wlcYT-!K!} zpAHXIClmWAog}&A31^jY82?I$3)GGX;9MIXRVD;(_KtgBdmR{Shz2*(CM+!|{S|Af67!lytM8w4E#hodJ9=U^D$5t9F z!nxU)WoFBR`RxC%>Ei|eu1n09~Mc0|2j0Vr^)$JA`~pSSSWAyIhU98YbeJ;>rCiEC*1alNh z*f$)G2(zY*IL4#40Cgewe-(StatwqkxQZz zUW7p7JdJ~xPV~zMj?Mx=m_hnlBe7>Ox_!MOPu7l1_5pNkpWSgR6LK_*^umRC1t(~y zhX}HcLv8U;`X~TcX}jKOJl6_;{jKQ^;XBd*(z!SUjQSp&e%SNSY}zc=N`!gO6AK(P z6U+ed{s!U~48j0$g)FkG1o?wvbu%P)+x0%*IuylOWJ*@IcXu(=Z3L>A`7~#)2k`Jd zUaBIN#fzW@jb`=OHU9sPK9%B^X2nF`BV0dCffrCPp+h|wvEcYFEh(}tx(IQ{VkyEH z=I#-p^SlR47<4VBcp+)N$+ke6jN`b3>IH@c1Eq_sSr_iT4uG4(RrlF+Uq3nyW_K)Y zdZM5wB(s1s^$qWtcfO!xq>DBwUZu)ZC1IgOd-%`7diGvnaBNXYJ%LS~d<3^aD@M{U z$U7>F|4B`Jrv;hE+@m>T?l-0a3=scbLcPM&msl1Kim2mbkGQxv`$Gba>He#zvker9xikCGq_yLEEC z($B4Ba(4tuXl)V{|No~|R194N_Xki3w%#Vh#ci183nHV=whs=(#^&8aOcIdYf^Tpk z`I8gp9C3+KUe2=yhgC=vUBq!h6{h-#j^2$Cr8#@r5_J#A>@I-AhfHJctesbE(h?F| zjvk{ZRMIE4j6*lgaZ4L(-av7(;5jTs5NIAeA%P2J6AUh!I6;<+){+mVW@j^wGrC1k zl8wQ%KO~hyY`)0n!dWLIWnoIaU&1k}_x^5Vi;)(A#6I5VYlmhxVCIiTAc7~H?_Lmbv(yfvv2KibCH87DOeHDN}lHK zGT)6CoMYar@8j=~#$<2U56L~?-2O|v^V!Gm>(!#O^GN2&vdjQCMW&cmKT&OyOy458 zBk3cbUGdM==mDp^dt}nO)oozdQ3#W-eg+7zE?6>m9;dLvtxWF2GC!U{UfeU|lD2R^ z;w5aq9z=dHQo2LQcjYqhjm@K_e=aJ6Ta4ZNo>&%eFx((N*!6Qz3dPJ}$`2j0RB{kw zgU|x=amTV~%wd2?s*zcgHm=_H1$!%oJLs(Rj@-eX2_geZCLv(Ys1vthtl;$E z(h)%jz9qB-HvZDRU3??=x@f^_-xGO-z%l_y0~hS@Nn9Z>TQDpz#MX2fe_$Kv#u6@P z;}}j;cf!D|WELSl2rycfyR{=D6%|#h*FHTaL5Q|12ZsCt2ipNc={kgpYQP#?bZHRR zADkfU*)X6dgvHj@jpZ9l)RS0hD_g@Q%>~?#c|MCo`+y^GJhzF%g78>`jM8*ELooaL z`kHzBp`$lNwVYjLzy#}A-GZ}!-2%(jZIlj*z#;W1E}Xa_0DbE@x1m6vE{T<%~BXmc~Ogp-q#MwgG~`iWF>yG`hD0vbQt zZp*f-O{#l?Ppg=?I%bYJD8NzI`~)^v8xw=CzxB)r(JW%MXGIQP*-2|ZSFWDz20Ydy zI8j}cW+4qMv=KjE?(2#kT$$Sq)>X8PNT;}(~tiw1RIN()4B+Jv&#nDGwseU*2@130y_s~o)zgnVEFlC}#gXAsbs;)dnS-yB(u$U`+(v7G>xL%Ye%v^u5Yc z#FzPxVoWrX757BlA@A0w42$;4PccTv_lop^Z+ZQm-07s!OV2Tz#eXyUxNAL@q7PX8 zp%Gtcp&Ev!TMgq+39a+wA+4LW0!8mVDk=6xTCjq?1k2~RKZZLFA#ClXoId*^3ilv3Yc9GgQVm|s~@ab&~r2qdUiP^jq-&aQSj-g*zg&WT7S z!n0sWlBKmYfRW0RKmIPyL$r4wsxU41%7!2=Fpb9v5qN!WKW4=uiziYmQYV+WbbFlQ zNardcgP;9KqtI3edTHlvL$@k{b91kUAL02pEI=~UTn}0F0UaQ#n?!-<*>?a9?+CLSgJ(3`;#WRIx3G@ z8K~{ga~{J!=&^s_S9pVp{#7L3DuY`mP#?)IMZR*+AY^t?fX4-2VBLC_FBO|Bq!q&g z=q#$lG_E658^=tZ2r6x7(ah1%8ff?0e?2%|TsEFiR3Q*GY`0@)#P@1!!Xolt-QyZf z4g2qQ2-)bvnF_q@#JP#pYLluML6~7xtU8(3;~o-eB(u)}{MkNQuYh_u1Gda_PeVOE zTGdd7S;1R#a+|vSD&t@T34UHh5WZ>sqFNy-ex0=c ze-h77oxbtpK8XBBkfRvXB>MIh_$h^88u7bk9l5>%YZE)N^tZ3rIMQrrx;7n$;3jmM zF2BT{G1qsl6pms2{lD$N$@3*$(W0Q+FHQpMZo7j=Egv0mlmh_arrPlm1h1l^af30D zLlg?3pJ=J^u^qkP%;UAM9KdbJDE?#l9u;Gb_H2B&l9z!hygh+^L=bUE$ugvz?jer> z)ub(L5#7&9p3xSD&z28$Ac!i%JBY!>mSC$InxbVp5s_{azEZe2l!O}#Xewu5x2oM! zaZrE=WCxJO)fGoIvKI>l=|9ySYsCdC{~QntPF>jvM>uyd)aoNMy&M$z?Z$TW9T|Lc zQ-z;j3uwF(+@;!A%M1!83}DJB27En!^KVhXUGBQ7+aXTsO`NV+~Y*D8`sU+HYO z{67;aOu8vU`s*i;u4lf}zo*LKk`n`rZ_6l-A={Y72FVA1J{{?DGHawMDXI^BdU*Km z5k8Em9~xm6C#WIO0zMvqs^e@70B2`msj)`7+-6p4Yg#F)dHNn}L_1_MmQz_WGA|#w z9T@Or;}^k+*P2ap+nB)pMud>fM8T@Oxt5xTFhxdOo2U1_(Z1AWRaKim=Uq0;P*l93 z_z$H;17jax-b@OSFDN_Ipk*G?QxR4__OvUaH_NAlvfG=hNV;pDkUPEu_IoMuD2I6YbyEsv$N}fVwgS;^MM>4O*aq^!v!^GLh2~u?B)i`PY|8YKT0d8zfY^pXkrIXVC$M&FjRqove zM2|KqN9S?aMzXG0|F+J|ztksz0BGtiTIQnUl85ca>2tC%JO5w1KO zWJofk&0$H44qtG{Vh6O%&1<8Rx%%-|C1t2%B}Fag0{?t^Sw)KT#k^glV5T=7Hsx7W zTRSxUK@oV_cBv|Dr1uMN8iBx4gUL}_Md%zmvqVfmRmyHo?IJPdu2%0fDayhGBwk{Q zilMkmOB)_&GC@UidS++K=C3ufp1E%flk$A!Ny>mnfJeo1ZuaFvoOY^BC!IHDX8CeP zL03$rr4+4SKZ+JktvRUC4mwFQ<8ktGx^HY$09Du9rOcAP_*htxC4R=>Css~Q)~~fM z(V1a9Jx}rat%SHyz*U1%@S*f_(c(-yJ(gQ{==ei%tCfB4Nz_bJZh)X5>BP+N550MB zmSda4bW2^zG3|}u;64n$Ff;0q=^}9}V_U)&*22<7Nt5E)E@I>~;{Q=-D zBC?XWIYASCLH?oUz}~(mk~ty2y^`Fhtd=VL;RN(j*^iTPAgJY5$v;K$ z6)f@ka58JaI)jVKOteZ)6muXTQ5bHwEcdJ`+$g3($g(qBYE^oTU}oeSKE)SY(CY{bu~Q=0)yM zhN>8SN+#MZA(XPy&%?2^yW4a`2uuI!mCj+2LH@iQawsXn=(AN238XG{8%Ld-bbmkF zMF>588VcGi2_8YA6#2D)m(E#V48Pbu&}Kw|6_TpAu{A$k`57Af4bu^)A1t{2_0H@4 z*`M#QmoNTUE_TQkM>oC|P%bL3sZ@6I^!#!}{cF9$*yxIQ%ASy>P^Y`HABz2=cPMDv zmP1E0=8l{)@-w#~piezu3;3+~>RsP;dZx2II(&eykc7acG{UE6we^_vE=VHkgYx8V zV2C3iQsQ@lra3XI0esQxoWW7CbJ6qgc4`d`ULAAu#G*qcQ6}n(E%vOYxG+-_3eC$F zxSfnS+RO1-!9Y-1DTUA7mb=b?Mg@iDD8}u^C>K3_j9@D89cs2VS2+x-|9`(79cw)D zNV7*M_*Au~;+`f)p4am(zbJS}SND!?#@8nd14oQj%8 zsWwTJ>0K9Acf2+#YHFjqZwJo2t=?pICEZ`Uok8`gfgk`s$hMN%v61a}xZ~3oMgE$6 zZ29=!)r2jCI77knMZNMAc!0~wQ*;@blV&Oy>SA>3J#deq_&VxQ^ zrrLHG`=R*aBXtV%@Ag>+!wn^*p(f9>Bpl)|BwHl-hvH%M-;RD{>U07hXoG~B- z>zhwR4dFqLbsWXrstZAAqbTC!7E=rH+kHM>pQKR-DA+@C99W#>voWD3p_Di z=mf9Mggw_3?qzOG1_5EuX>x99Kjl+}cS{dG$OKIjxt+da`K>XEfzz2))|Og; zv=lN2ipo^T#<7}zl;Eu+>RAu(iIA`ptvN3&-j?HaH*wVK~Ey3%Ci7-;XQg;MK&zZm3z2GifC1A*u{hVcX&jAc)I3Hg-jH+U)% zXMw?~7f~KHrcCatdOC(i2G34pb`E|dxr#_5I9ABiTxm~TvOhBtNXF6ag#0kW1U_QDG@LsYPjHQijZF7qH=0Qwb! z5&P=#=_cub^WY2-4 zGeH+d-yWC@YsrBjPX7R}d`=RP!r?A;#gJqUMm(v^3w)srJhuIG$%h!etcKV*epNPi z7hevYHU007hl(N^>REXN(eb1cWtkd9S3)N%yXIdc=<$qNDD!vSk6-RIP5Fzn@!4WR zzD=K)MXAd8-W*$tq^A@NO)Cj_;s^s*2ZoAJHhlmUmfd@w)dq%N!ACCIX1HJBCn*+ZpYE%Pw#(J%wn;BI$(icN$@c-ypx_pyP#50W8O82+g&O!* z5IMPT{5`1&h8@#BED>rOPd8J(#a`60g{S|SYkHN*!ZzosCb*OJRUL-b=x={I4zBr1 z;v{Gwd&P7}lG~g_M$-gV^+^V!)tn+G7P(MPYQ2De*FgEGS9!9 TO|74SfUg%Sn#whb79sx^*%-F;