From c0ae7feb2d9c5a820b016b2b70753395ed604cd4 Mon Sep 17 00:00:00 2001 From: thgvr Date: Wed, 17 Apr 2024 13:05:53 -0700 Subject: [PATCH] Updatepaths Maps --- .../BeachRuins/beach_crashed_starwalker.dmm | 2 +- .../BeachRuins/beach_fishing_hut.dmm | 10 +- .../BeachRuins/beach_float_resort.dmm | 14 +-- .../BeachRuins/beach_ocean_town.dmm | 54 +++------ .../IceRuins/icemoon_crashed_holemaker.dmm | 8 +- .../icemoon_underground_abandoned_village.dmm | 20 +--- .../JungleRuins/jungle_abandoned_library.dmm | 24 +--- .../JungleRuins/jungle_bombed_starport.dmm | 2 +- .../JungleRuins/jungle_cavecrew.dmm | 14 +-- .../JungleRuins/jungle_interceptor.dmm | 16 +-- .../JungleRuins/jungle_medtech_outbreak.dmm | 4 +- .../jungle_surface_bombmakers_cabin.dmm | 2 +- .../lavaland_surface_biodome_winter.dmm | 8 +- .../LavaRuins/lavaland_surface_codelab.dmm | 32 ++---- .../lavaland_surface_comm_outpost.dmm | 11 +- .../RockRuins/rockplanet_budgetcuts.dmm | 12 +- .../RockRuins/rockplanet_dangerpod.dmm | 4 +- .../RockRuins/rockplanet_harmfactory.dmm | 8 +- .../RockRuins/rockplanet_house.dmm | 12 +- .../whitesands_surface_camp_saloon.dmm | 28 ++--- .../whitesands_surface_waterplant.dmm | 4 +- _maps/RandomRuins/SpaceRuins/astraeus.dmm | 10 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 4 +- _maps/RandomRuins/SpaceRuins/power_puzzle.dmm | 38 ++----- .../SpaceRuins/singularity_lab.dmm | 18 +-- _maps/RandomRuins/SpaceRuins/spacemall.dmm | 45 ++------ _maps/RandomRuins/SpaceRuins/vaporwave.dmm | 12 +- .../wasteplanet_abandoned_mechbay.dmm | 20 +--- .../WasteRuins/wasteplanet_crash_kitchen.dmm | 2 +- .../wasteplanet_fortress_of_solitide.dmm | 16 +-- _maps/map_files/generic/CentCom.dmm | 74 ++++--------- _maps/outpost/hangar/nt_asteroid_20x20.dmm | 8 +- _maps/outpost/hangar/nt_asteroid_40x20.dmm | 4 +- _maps/outpost/hangar/nt_asteroid_40x40.dmm | 8 +- _maps/outpost/hangar/nt_asteroid_56x20.dmm | 20 +--- _maps/outpost/hangar/nt_asteroid_56x40.dmm | 20 +--- _maps/outpost/hangar/nt_ice_40x40.dmm | 5 +- _maps/outpost/hangar/nt_ice_56x40.dmm | 5 +- _maps/outpost/indie_space.dmm | 44 +++----- _maps/outpost/nanotrasen_asteroid.dmm | 99 +++++------------ _maps/outpost/nanotrasen_ice.dmm | 10 +- .../independent/independent_beluga.dmm | 33 ++---- .../independent/independent_boyardee.dmm | 12 +- .../independent/independent_dwayne.dmm | 8 +- .../shuttles/independent/independent_kilo.dmm | 13 +-- .../independent/independent_lagoon.dmm | 78 ++++--------- .../independent/independent_rigger.dmm | 12 +- .../independent/independent_schmiedeberg.dmm | 12 +- .../independent/independent_shetland.dmm | 4 +- .../independent/independent_tranquility.dmm | 104 +++++------------- _maps/shuttles/inteq/inteq_colossus.dmm | 4 +- _maps/shuttles/inteq/inteq_talos.dmm | 18 +-- _maps/shuttles/inteq/inteq_valor.dmm | 16 +-- _maps/shuttles/inteq/inteq_vaquero.dmm | 4 +- _maps/shuttles/minutemen/minutemen_vela.dmm | 34 ++---- .../shuttles/nanotrasen/nanotrasen_heron.dmm | 43 +++----- _maps/shuttles/nanotrasen/nanotrasen_meta.dmm | 18 +-- .../shuttles/nanotrasen/nanotrasen_mimir.dmm | 42 ++----- .../shuttles/nanotrasen/nanotrasen_osprey.dmm | 14 +-- .../shuttles/nanotrasen/nanotrasen_ranger.dmm | 20 +--- .../nanotrasen/nanotrasen_skipper.dmm | 42 ++----- _maps/shuttles/pgf/pgf_crying_sun.dmm | 20 +--- _maps/shuttles/pirate/pirate_ember.dmm | 10 +- _maps/shuttles/roumain/srm_elder.dmm | 16 +-- _maps/shuttles/solgov/solgov_chronicle.dmm | 16 +-- _maps/shuttles/solgov/solgov_inkwell.dmm | 24 ++-- _maps/shuttles/solgov/solgov_paracelsus.dmm | 38 ++----- _maps/shuttles/syndicate/syndicate_aegis.dmm | 30 ++--- .../syndicate/syndicate_cybersun_kansatsu.dmm | 12 +- .../syndicate/syndicate_gorlex_hyena.dmm | 10 +- .../syndicate/syndicate_gorlex_komodo.dmm | 4 +- .../syndicate/syndicate_twinkleshine.dmm | 4 +- _maps/templates/shelter_1.dmm | 4 +- _maps/templates/shelter_2.dmm | 6 +- _maps/templates/shelter_3.dmm | 6 +- 75 files changed, 431 insertions(+), 1051 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm index 3bf64a6b03b7..f8724e04f0de 100644 --- a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm @@ -2751,7 +2751,7 @@ /obj/effect/decal/cleanable/blood/old{ icon_state = "gib2-old" }, -/obj/structure/chair/comfy/black{ +/obj/structure/chair/comfy/grey/directional/south{ desc = "It looks incredibly comfy, and expensive. Theres a little note on the side, explaining how its made of %100 real cow skin."; name = "Cowskin chair" }, diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm index 3b801c086ff3..4aaff2b5a160 100644 --- a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ae" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/ruin/beach) @@ -483,7 +481,7 @@ /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) "sN" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/machinery/light/small/directional/north{ light_color = "#694c12" }, @@ -853,7 +851,7 @@ /turf/open/floor/plastic, /area/ruin/beach) "GP" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/decal/cleanable/cobweb, /mob/living/simple_animal/hostile/pirate/melee{ faction = list("beach","pirate") @@ -1136,7 +1134,7 @@ /turf/open/floor/wood, /area/ruin/beach) "Rh" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /mob/living/simple_animal/hostile/pirate/melee{ faction = list("beach","pirate") }, diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm index d393dadb3b64..bbac1ae4e8d9 100644 --- a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm @@ -163,9 +163,7 @@ }, /area/ruin/beach/float_resort) "dZ" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/wood{ light_range = 2 }, @@ -824,7 +822,7 @@ /turf/open/floor/plating, /area/overmap_encounter/planetoid/beachplanet/explored) "wn" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /turf/open/floor/wood{ light_range = 2 }, @@ -1178,9 +1176,7 @@ }, /area/overmap_encounter/planetoid/beachplanet/explored) "Fk" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/light/small/directional/west, /turf/open/floor/wood{ light_range = 2 @@ -1313,9 +1309,7 @@ }, /area/ruin/beach/float_resort) "Io" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /turf/open/floor/wood{ light_range = 2 }, diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index 583c196e3dc3..3a7fb09aa5f6 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -175,9 +175,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/carpet/black, /area/ruin/beach/oceantown/bar) "cy" = ( @@ -266,9 +264,7 @@ /turf/open/floor/plasteel/white, /area/ruin/beach/oceantown/bar) "dF" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /turf/open/floor/carpet/green, /area/ruin/beach/oceantown/hotel) "dL" = ( @@ -393,9 +389,7 @@ /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "eN" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /turf/open/floor/carpet/green, /area/ruin/beach/oceantown/hotel) "eV" = ( @@ -488,9 +482,7 @@ }, /area/overmap_encounter/planetoid/beachplanet/explored) "fJ" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /turf/open/floor/carpet/green, /area/ruin/beach/oceantown/hotel) "fL" = ( @@ -708,7 +700,7 @@ /turf/open/floor/carpet, /area/ruin/beach/oceantown/hotel) "iv" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/open/floor/carpet/green, /area/ruin/beach/oceantown/hotel) "iw" = ( @@ -1024,9 +1016,7 @@ }, /area/overmap_encounter/planetoid/beachplanet/explored) "mJ" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /turf/open/floor/carpet/green, /area/ruin/beach/oceantown/hotel) "mR" = ( @@ -1395,9 +1385,7 @@ /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "sj" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /turf/open/floor/wood, /area/ruin/beach/oceantown) "sp" = ( @@ -1416,9 +1404,7 @@ /turf/open/floor/plasteel/mono, /area/ruin/beach/oceantown) "sr" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/carpet/black, /area/ruin/beach/oceantown/bar) "sy" = ( @@ -1477,7 +1463,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/beach/oceantown) "te" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/open/floor/wood, /area/ruin/beach/oceantown) "ti" = ( @@ -1969,7 +1955,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/beach/oceantown/bar) "zk" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /turf/open/floor/wood, /area/ruin/beach/oceantown) "zl" = ( @@ -2903,9 +2889,7 @@ /turf/open/floor/plasteel, /area/ruin/beach/oceantown/bar) "IU" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /turf/open/floor/wood, /area/ruin/beach/oceantown) "IX" = ( @@ -3563,7 +3547,7 @@ }, /area/overmap_encounter/planetoid/beachplanet/explored) "PE" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /turf/open/floor/wood, /area/ruin/beach/oceantown) "PF" = ( @@ -3729,9 +3713,7 @@ /turf/open/floor/plating, /area/overmap_encounter/planetoid/beachplanet/explored) "Sv" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/carpet/black, /area/ruin/beach/oceantown/bar) "Sy" = ( @@ -3769,9 +3751,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) "SY" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /turf/open/floor/carpet/black, /area/ruin/beach/oceantown/bar) "Tj" = ( @@ -4012,9 +3992,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/beach/oceantown) "VZ" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /turf/open/floor/wood, /area/ruin/beach/oceantown) "Wd" = ( @@ -4274,7 +4252,7 @@ /turf/open/floor/wood, /area/ruin/beach/oceantown/hotel) "Zr" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /turf/open/floor/carpet/black, /area/ruin/beach/oceantown/bar) "Zy" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm index 50f7b24ed353..d17c4f371728 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm @@ -689,9 +689,7 @@ /obj/effect/turf_decal/trimline/transparent/ntblue/arrow_ccw, /obj/effect/turf_decal/weather/dirt, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/plasteel/tech/techmaint, /area/ruin/unpowered/crashed_holemaker) "lO" = ( @@ -2540,9 +2538,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/comfy/teal{ - dir = 8 - }, +/obj/structure/chair/comfy/blue/directional/west, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ruin/unpowered/crashed_holemaker) diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index 98397324244f..946d28dc1a13 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -65,7 +65,7 @@ /turf/open/floor/carpet, /area/ruin/powered) "he" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/closed/mineral/random/snow, /area/overmap_encounter/planetoid/cave/explored) "hD" = ( @@ -178,9 +178,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/overmap_encounter/planetoid/cave/explored) "pP" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ruin/powered) @@ -311,9 +309,7 @@ /turf/open/floor/carpet, /area/ruin/powered) "yb" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /turf/open/floor/wood, /area/ruin/powered) "yS" = ( @@ -351,14 +347,12 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/overmap_encounter/planetoid/cave/explored) "Cd" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/carpet, /area/ruin/powered) "Cl" = ( /obj/effect/decal/cleanable/blood/old, -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -483,9 +477,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/overmap_encounter/planetoid/cave/explored) "Os" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/carpet, /area/ruin/powered) "Pp" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm index 007b969e0985..9c3e4c090eb6 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm @@ -132,9 +132,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/structure/spacevine{ name = "vines" }, @@ -1007,9 +1005,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/carpet/red, /area/ruin/jungle) "qm" = ( @@ -1271,9 +1267,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/structure/spacevine{ name = "vines" }, @@ -1438,9 +1432,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/spacevine{ name = "vines" @@ -2418,9 +2410,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/structure/spacevine{ name = "vines" }, @@ -3329,9 +3319,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/structure/spacevine{ name = "vines" }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm index 7f5b18cd2014..261235fabc68 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm @@ -2756,7 +2756,7 @@ }, /area/overmap_encounter/planetoid/jungle/explored) "to" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /turf/open/floor/wood, /area/ruin/jungle/starport) "tp" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index bed82db78338..928318c23ffe 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -662,9 +662,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/jungle/cavecrew/bridge) "iE" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/structure/cable{ icon_state = "1-2" }, @@ -2580,10 +2578,9 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood/corner, -/obj/structure/chair/comfy/brown{ +/obj/structure/chair/comfy/orange/directional/east{ buildstackamount = 0; - color = "#c45c57"; - dir = 4 + color = "#c45c57" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood{ @@ -3765,9 +3762,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/structure/chair/comfy/brown{ - color = "#66b266"; - dir = 4 +/obj/structure/chair/comfy/orange/directional/east{ + color = "#66b266" }, /obj/item/book/manual/wiki/surgery{ pixel_x = 10; diff --git a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm index 628c44f42f6e..239a29bb032b 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm @@ -757,9 +757,7 @@ /turf/open/floor/plating/rust, /area/ruin/jungle/interceptor/porthall) "fY" = ( -/obj/structure/chair/comfy/teal{ - dir = 4 - }, +/obj/structure/chair/comfy/blue/directional/east, /obj/effect/decal/cleanable/robot_debris/gib, /obj/machinery/firealarm/directional/south, /obj/machinery/light_switch{ @@ -2220,9 +2218,7 @@ /obj/effect/turf_decal/corner_steel_grid{ dir = 10 }, -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /turf/open/floor/plasteel/dark, /area/ruin/jungle/interceptor/starhall) "tk" = ( @@ -2683,9 +2679,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ruin/jungle/interceptor/forehall) "wN" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/broken/directional/east, /obj/effect/decal/cleanable/glass, @@ -5149,9 +5143,7 @@ /obj/effect/turf_decal/corner_steel_grid/full{ dir = 4 }, -/obj/structure/chair/sofa/corner{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/corner/directional/west, /obj/machinery/light_switch{ dir = 8; pixel_x = 25; diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm index bdd58e286f25..0f68c7b7ebd9 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm @@ -540,9 +540,7 @@ /turf/open/floor/plasteel/white, /area/ship/science/storage) "jL" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/zombie{ name = "Zombiefied Facility Director"; diff --git a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm index ca1c8dc0794f..878e674b7835 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm @@ -178,7 +178,7 @@ /turf/open/floor/plating/grass/jungle/lit, /area/overmap_encounter/planetoid/jungle/explored) "sV" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /turf/open/floor/carpet/red, /area/ruin/powered) "sX" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 58c683e6d043..0f7efcf3f2ad 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -110,9 +110,7 @@ /turf/open/floor/plating/asteroid/snow, /area/ruin/powered/snow_biodome) "aA" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aB" = ( @@ -137,9 +135,7 @@ /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aG" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aH" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm index 1ff358a4dd8b..1f2e77364219 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm @@ -723,9 +723,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/unpowered/codelab/storage) "iN" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "je" = ( @@ -768,9 +766,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "jz" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "jB" = ( @@ -1286,9 +1282,7 @@ /turf/open/floor/plating, /area/ruin/unpowered/codelab/maintenance) "pY" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "qb" = ( @@ -1529,9 +1523,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/unpowered/codelab/storage) "sA" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /turf/open/floor/wood, /area/ruin/unpowered/codelab/laboratory) "sB" = ( @@ -2397,9 +2389,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/unpowered/codelab/reception) "Cw" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "CA" = ( @@ -2533,9 +2523,7 @@ /turf/open/floor/wood, /area/ruin/unpowered/codelab/laboratory) "DJ" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "DL" = ( @@ -3302,9 +3290,7 @@ /turf/open/floor/engine/o2, /area/ruin/unpowered/codelab/maintenance) "Ob" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/machinery/light/dim/directional/south, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) @@ -4009,9 +3995,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/wood, /area/ruin/unpowered/codelab/laboratory) "XB" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm index ac1c579eedb1..91b482df849f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm @@ -12,9 +12,8 @@ }, /area/ruin/unpowered/syndicate_outpost) "cO" = ( -/obj/structure/chair/comfy/black{ - desc = "It looks like it hasn't been used in a long time."; - dir = 1 +/obj/structure/chair/comfy/grey/directional/north{ + desc = "It looks like it hasn't been used in a long time." }, /turf/open/floor/carpet/black, /area/ruin/unpowered/syndicate_outpost) @@ -56,9 +55,7 @@ }, /area/ruin/unpowered/syndicate_outpost) "qp" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/mineral/plastitanium/red{ name = "base floor" }, @@ -136,7 +133,7 @@ }, /area/ruin/unpowered/syndicate_outpost) "Kq" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /turf/open/floor/carpet, /area/ruin/unpowered/syndicate_outpost) "Kw" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index c596392f89a4..259991408266 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -183,9 +183,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/rockplanet/nanotrasen) "cq" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/carpet/purple, /area/ruin/rockplanet/nanotrasen) "cy" = ( @@ -478,9 +476,7 @@ /turf/open/floor/plasteel/white, /area/ruin/rockplanet/nanotrasen) "hT" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/carpet/red, /area/ruin/rockplanet/nanotrasen) "hY" = ( @@ -1680,9 +1676,7 @@ }, /area/ruin/rockplanet/nanotrasen) "BZ" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/turf_decal/corner/opaque/red/border{ dir = 10 }, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm b/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm index 4e363388cca6..dd6bb43fd913 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_dangerpod.dmm @@ -28,9 +28,7 @@ /turf/open/floor/pod/dark, /area/overmap_encounter/planetoid/rockplanet/explored) "M" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/structure/tubes, /obj/effect/decal/cleanable/blood/old, /mob/living/simple_animal/hostile/mining_drone/rockplanet, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm index ed6c98765b2b..702885f9a0a8 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm @@ -1956,9 +1956,7 @@ /turf/open/floor/plasteel/patterned, /area/ruin/powered) "SW" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/ruin/powered) @@ -1994,9 +1992,7 @@ /turf/open/floor/plating, /area/ruin/powered) "TM" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/plating, /area/ruin/powered) "TU" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_house.dmm b/_maps/RandomRuins/RockRuins/rockplanet_house.dmm index e06f8a456840..7c13fbf7bd25 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_house.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_house.dmm @@ -35,9 +35,7 @@ /turf/open/floor/carpet, /area/ruin/unpowered) "y" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /turf/open/floor/carpet, /area/ruin/unpowered) "A" = ( @@ -59,15 +57,11 @@ /turf/open/floor/carpet/donk, /area/ruin/unpowered) "O" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /turf/open/floor/carpet, /area/ruin/unpowered) "V" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /turf/open/floor/carpet, /area/ruin/unpowered) "X" = ( diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm index 673b21cf90ae..b17207b75020 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm @@ -495,9 +495,7 @@ /turf/open/floor/wood, /area/ruin/whitesands/saloon) "nU" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -727,7 +725,7 @@ /turf/open/floor/wood, /area/ruin/whitesands/saloon) "vl" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -741,9 +739,7 @@ }, /area/ruin/whitesands/saloon) "vN" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -905,7 +901,7 @@ /turf/open/floor/plating, /area/ruin/whitesands/saloon) "Br" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, @@ -1191,9 +1187,7 @@ /turf/open/floor/carpet, /area/ruin/whitesands/saloon) "IY" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -1208,7 +1202,7 @@ /turf/open/floor/wood, /area/ruin/whitesands/saloon) "Ji" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -1231,9 +1225,7 @@ /turf/open/floor/wood, /area/ruin/whitesands/saloon) "Ku" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/corner/directional/west, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -1406,9 +1398,7 @@ /turf/template_noop, /area/template_noop) "QB" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -1530,7 +1520,7 @@ /turf/open/floor/wood, /area/ruin/whitesands/saloon) "UT" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/effect/turf_decal/siding/wood, /obj/structure/sign/poster/official/cohiba_robusto_ad{ pixel_y = 32 diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm index fe95fca0e82b..ae51575ef49c 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_waterplant.dmm @@ -1093,7 +1093,7 @@ /turf/open/floor/plasteel, /area/ruin/powered) "Bb" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /turf/open/floor/carpet, /area/ruin/powered) "Bs" = ( @@ -1213,7 +1213,7 @@ /turf/open/floor/plasteel, /area/ruin/powered) "DT" = ( -/obj/structure/chair/comfy/teal, +/obj/structure/chair/comfy/blue/directional/south, /turf/open/floor/carpet, /area/ruin/powered) "DU" = ( diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm index db2b305b063b..2629cc5d1cd1 100644 --- a/_maps/RandomRuins/SpaceRuins/astraeus.dmm +++ b/_maps/RandomRuins/SpaceRuins/astraeus.dmm @@ -24,9 +24,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/has_grav/astraeus/munitions) "au" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/carpet/airless, /area/ruin/space/has_grav/astraeus/dorms_med) "aN" = ( @@ -56,8 +54,7 @@ }, /area/ruin/space/has_grav/astraeus/hallway) "ch" = ( -/obj/structure/chair/comfy/black{ - dir = 4; +/obj/structure/chair/comfy/grey/directional/east{ name = "Captain" }, /obj/effect/decal/cleanable/dirt, @@ -2039,8 +2036,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/astraeus/bridge) "ZT" = ( -/obj/structure/chair/comfy/black{ - dir = 4; +/obj/structure/chair/comfy/grey/directional/east{ name = "Helm" }, /obj/effect/turf_decal/corner/opaque/blue{ diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index c46f8d421a17..0ff038bd93de 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -927,9 +927,7 @@ /turf/open/space, /area/space/nearstation) "cJ" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/plasteel, /area/ruin/space/has_grav/onehalf) "cL" = ( diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm index 291fd054aa63..b76ae63a86e7 100644 --- a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm +++ b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm @@ -184,9 +184,7 @@ dir = 9 }, /obj/effect/turf_decal/corner/transparent/grey/diagonal, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powerpuzzle) "aJ" = ( @@ -210,9 +208,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /turf/open/floor/wood, /area/ruin/space/has_grav/powerpuzzle/secure) "aO" = ( @@ -277,9 +273,7 @@ /area/ruin/space/has_grav/powerpuzzle/secure) "aY" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/turf_decal/corner/transparent/grey/diagonal, /obj/structure/sign/poster/contraband/space_up{ pixel_x = 32 @@ -492,7 +486,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /turf/open/floor/wood, /area/ruin/space/has_grav/powerpuzzle/secure) "bT" = ( @@ -2638,9 +2632,7 @@ "Hl" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /obj/effect/turf_decal/corner/transparent/grey/diagonal, /obj/structure/sign/poster/contraband/space_cops{ pixel_y = 32 @@ -3071,9 +3063,7 @@ "NT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/broken/directional/east, -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/turf_decal/trimline/transparent/green/filled/warning, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle) @@ -3091,9 +3081,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 9 }, -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle) "OL" = ( @@ -3141,9 +3129,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/powerpuzzle) "OY" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/effect/turf_decal/corner/transparent/grey/diagonal, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powerpuzzle) @@ -3243,9 +3229,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 8 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powerpuzzle) "PL" = ( @@ -3445,9 +3429,7 @@ "SY" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/effect/turf_decal/corner/transparent/grey/diagonal, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/powerpuzzle) diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm index c9984937d2a7..ab4d4aeecf39 100644 --- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -4522,7 +4522,7 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/singularitylab/lab) "rQ" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel, @@ -6225,9 +6225,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/singularitylab/cargo) "zo" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /turf/open/floor/wood, /area/ruin/space/has_grav/singularitylab/civvie) "zq" = ( @@ -6493,9 +6491,7 @@ /turf/open/floor/engine, /area/ruin/space/has_grav/singularitylab) "Ao" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, @@ -7548,9 +7544,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/space/has_grav/singularitylab/lab) "Ed" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/singularitylab/reactor) "Ef" = ( @@ -9865,9 +9859,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/singularitylab/lab) "Mo" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/wood, /area/ruin/space/has_grav/singularitylab/civvie) "Mq" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm index e5ed66920caf..eb669d4116ea 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm @@ -420,10 +420,7 @@ /area/ruin/space/has_grav/spacemall/dorms) "bJ" = ( /obj/effect/turf_decal/corner/opaque/grey/diagonal, -/obj/structure/chair/sofa{ - dir = 4; - pixel_x = -7 - }, +/obj/structure/chair/sofa/brown/directional/east, /mob/living/simple_animal/hostile/poison/giant_spider{ environment_smash = 0 }, @@ -621,9 +618,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/carpet/green, /area/ruin/space/has_grav/spacemall/maint) "cD" = ( @@ -2772,9 +2767,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall) "kw" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /obj/machinery/light/directional/south, /obj/effect/turf_decal/corner/transparent/lime{ dir = 8 @@ -2888,9 +2881,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/plating, /area/ruin/space/has_grav/spacemall/maint) "kW" = ( @@ -3704,10 +3695,7 @@ /area/ruin/space/has_grav/spacemall/maint) "oj" = ( /obj/effect/turf_decal/corner/opaque/grey/diagonal, -/obj/structure/chair/sofa{ - dir = 4; - pixel_x = -7 - }, +/obj/structure/chair/sofa/brown/directional/east, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/spacemall) "ol" = ( @@ -4810,9 +4798,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall) "rU" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/effect/turf_decal/corner/transparent/lime{ dir = 8 }, @@ -5145,7 +5131,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/dorms) "th" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/effect/turf_decal/corner/transparent/lime{ dir = 4 }, @@ -5520,7 +5506,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/spacemall/dorms) "uz" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/turf_decal/corner/transparent/lime{ dir = 4 }, @@ -7349,7 +7335,7 @@ /turf/open/floor/carpet/green, /area/ruin/space/has_grav/spacemall/maint) "BL" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/turf_decal/corner/transparent/lime{ dir = 4 }, @@ -9717,9 +9703,7 @@ /obj/structure/disposalpipe/broken{ dir = 1 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/item/toy/plush/snakeplushie, /turf/open/floor/plating, /area/ruin/space/has_grav/spacemall/maint) @@ -11454,9 +11438,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/spacemall/maint) "QM" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/turf_decal/corner/transparent/lime{ dir = 8 }, @@ -13472,10 +13454,7 @@ /obj/structure/mirror{ pixel_x = 25 }, -/obj/structure/chair/sofa{ - dir = 8; - pixel_x = 7 - }, +/obj/structure/chair/sofa/brown/directional/west, /turf/open/floor/wood, /area/ruin/space/has_grav/spacemall/shop) "YM" = ( diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm index ca6fd4e7274e..cca20b75c275 100644 --- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -43,9 +43,7 @@ /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/powered/aesthetic) "l" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/powered/aesthetic) "m" = ( @@ -54,9 +52,7 @@ /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/powered/aesthetic) "n" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/powered/aesthetic) "o" = ( @@ -188,9 +184,7 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "O" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/machinery/light/small/directional/north, /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/powered/aesthetic) diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm index cc330e69baa9..20301b381145 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm @@ -1557,7 +1557,7 @@ /turf/open/floor/concrete/slab_1, /area/ruin/wasteplanet/abandoned_mechbay/bay1) "rT" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /mob/living/simple_animal/hostile/syndicate{ name = "Syndicate Engineer"; desc = "Death to bad mechanics." @@ -1677,9 +1677,7 @@ /turf/open/floor/concrete/slab_1, /area/ruin/wasteplanet/abandoned_mechbay/bay1) "ts" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, @@ -2614,9 +2612,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ruin/wasteplanet/abandoned_mechbay/crewquarters) "Ew" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /turf/open/floor/plasteel, /area/ruin/wasteplanet/abandoned_mechbay/crewquarters) "EI" = ( @@ -3095,9 +3091,7 @@ /turf/open/floor/plasteel/white, /area/ruin/wasteplanet/abandoned_mechbay/mechlab) "KB" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/corner/directional/west, /turf/open/floor/plasteel, /area/ruin/wasteplanet/abandoned_mechbay/crewquarters) "KC" = ( @@ -3452,9 +3446,7 @@ /turf/open/floor/concrete/slab_1, /area/ruin/wasteplanet/abandoned_mechbay/bay1) "OP" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /obj/structure/extinguisher_cabinet/directional/north, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, @@ -4009,7 +4001,7 @@ /turf/open/floor/plating/asteroid/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "WR" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/trimline/opaque/neutral/filled/warning{ dir = 1 diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm index 7a4b5e4caa3c..18e6bdb2fbd7 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm @@ -376,7 +376,7 @@ }, /area/overmap_encounter/planetoid/wasteplanet/explored) "QS" = ( -/obj/structure/chair/comfy/teal, +/obj/structure/chair/comfy/blue/directional/south, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/ruin/unpowered) diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm index 7756fdfa1fd6..1702f2ab5824 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm @@ -1028,9 +1028,7 @@ /turf/open/floor/plating, /area/ruin/powered) "jS" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /mob/living/simple_animal/hostile/retaliate/goose/vomit{ dir = 1 }, @@ -2038,9 +2036,7 @@ faction = list("neutral"); name = "Douglas the Friendly Maintenance Goliath" }, -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /turf/open/floor/plating, /area/ruin/powered) "sH" = ( @@ -2099,9 +2095,7 @@ /turf/open/floor/plating, /area/ruin/powered) "tB" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/plating, /area/ruin/powered) "tF" = ( @@ -3813,9 +3807,7 @@ /turf/open/floor/plating/rust, /area/ruin/powered) "Jm" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/plating, /area/ruin/powered) "Jn" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index bd6d72b49562..6c80b8b2096f 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -103,9 +103,7 @@ /turf/closed/indestructible/riveted, /area/ctf) "agb" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -421,7 +419,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/control) "akA" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /turf/open/floor/plasteel/grimy, /area/centcom/control) "akB" = ( @@ -465,7 +463,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/control) "akG" = ( -/obj/structure/chair/comfy/brown{ +/obj/structure/chair/comfy/orange/directional/south{ color = "#596479" }, /turf/open/floor/plasteel/grimy, @@ -613,9 +611,8 @@ }, /area/centcom/control) "alw" = ( -/obj/structure/chair/comfy/brown{ - buildstackamount = 0; - dir = 1 +/obj/structure/chair/comfy/orange/directional/north{ + buildstackamount = 0 }, /turf/open/floor/plasteel/grimy, /area/centcom/control) @@ -954,9 +951,7 @@ /turf/open/floor/wood, /area/centcom/ferry) "aoC" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "aoD" = ( @@ -965,9 +960,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "aoE" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "aoF" = ( @@ -986,9 +979,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "aoH" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -1001,9 +992,8 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "aoK" = ( -/obj/structure/chair/comfy/brown{ - color = "#596479"; - dir = 1 +/obj/structure/chair/comfy/orange/directional/north{ + color = "#596479" }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -1029,9 +1019,7 @@ /turf/open/floor/wood, /area/centcom/ferry) "aoZ" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -1059,9 +1047,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "apb" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "apc" = ( @@ -1566,7 +1552,7 @@ /turf/open/floor/plasteel, /area/centcom/supply) "asx" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, @@ -1577,7 +1563,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "asy" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) @@ -1749,18 +1735,14 @@ /turf/open/floor/plating/airless, /area/syndicate_mothership/control) "aup" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "auq" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "aus" = ( @@ -3551,9 +3533,7 @@ /area/abductor_ship) "aJQ" = ( /obj/effect/landmark/thunderdome/admin, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/plasteel/grimy, /area/tdome/tdomeadmin) "aJY" = ( @@ -4504,9 +4484,8 @@ /turf/open/floor/wood, /area/centcom/holding) "aPj" = ( -/obj/structure/chair/comfy/brown{ - color = "#596479"; - dir = 4 +/obj/structure/chair/comfy/orange/directional/east{ + color = "#596479" }, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) @@ -6975,9 +6954,7 @@ /turf/open/floor/plasteel/dark, /area/ctf) "cEn" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, @@ -7558,9 +7535,8 @@ /turf/open/floor/plasteel, /area/tdome/tdomeobserve) "ebb" = ( -/obj/structure/chair/comfy/brown{ - color = "#66b266"; - dir = 1 +/obj/structure/chair/comfy/orange/directional/north{ + color = "#66b266" }, /obj/effect/turf_decal/corner/opaque/green{ dir = 1 @@ -10815,9 +10791,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/control) "kJi" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/machinery/light/directional/south, /obj/machinery/status_display/evac{ pixel_y = -32 @@ -13219,7 +13193,7 @@ /turf/open/floor/wood/walnut, /area/centcom) "pwJ" = ( -/obj/structure/chair/comfy/brown{ +/obj/structure/chair/comfy/orange/directional/south{ color = "#596479" }, /obj/effect/turf_decal/corner/transparent/neutral{ diff --git a/_maps/outpost/hangar/nt_asteroid_20x20.dmm b/_maps/outpost/hangar/nt_asteroid_20x20.dmm index 159af62d17cf..f819039d3f0d 100644 --- a/_maps/outpost/hangar/nt_asteroid_20x20.dmm +++ b/_maps/outpost/hangar/nt_asteroid_20x20.dmm @@ -9,9 +9,7 @@ }, /area/hangar) "an" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/plasteel/tech{ planetary_atmos = 1 }, @@ -1526,7 +1524,7 @@ }, /area/hangar) "PN" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/concrete/reinforced{ planetary_atmos = 1 @@ -1904,7 +1902,7 @@ }, /area/hangar) "Zq" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/item/reagent_containers/food/drinks/mug{ pixel_x = -5; pixel_y = -3 diff --git a/_maps/outpost/hangar/nt_asteroid_40x20.dmm b/_maps/outpost/hangar/nt_asteroid_40x20.dmm index 0d229e5d7af9..b57c4972362c 100644 --- a/_maps/outpost/hangar/nt_asteroid_40x20.dmm +++ b/_maps/outpost/hangar/nt_asteroid_40x20.dmm @@ -2032,9 +2032,7 @@ }, /area/hangar) "ZQ" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech{ planetary_atmos = 1 diff --git a/_maps/outpost/hangar/nt_asteroid_40x40.dmm b/_maps/outpost/hangar/nt_asteroid_40x40.dmm index a2c2f915da96..48649aedf4d8 100644 --- a/_maps/outpost/hangar/nt_asteroid_40x40.dmm +++ b/_maps/outpost/hangar/nt_asteroid_40x40.dmm @@ -35,9 +35,7 @@ /turf/open/floor/plasteel/dark, /area/hangar) "cT" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -272,9 +270,7 @@ }, /area/hangar) "ls" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, diff --git a/_maps/outpost/hangar/nt_asteroid_56x20.dmm b/_maps/outpost/hangar/nt_asteroid_56x20.dmm index 6425522d0977..9dac115ca5e7 100644 --- a/_maps/outpost/hangar/nt_asteroid_56x20.dmm +++ b/_maps/outpost/hangar/nt_asteroid_56x20.dmm @@ -72,9 +72,7 @@ }, /area/hangar) "bt" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /turf/open/floor/concrete/reinforced{ planetary_atmos = 1 }, @@ -138,9 +136,7 @@ /turf/open/floor/carpet/red, /area/hangar) "do" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /obj/machinery/light/directional/east, /turf/open/floor/concrete/reinforced{ planetary_atmos = 1 @@ -501,9 +497,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/carpet/red, /area/hangar) "sd" = ( @@ -643,9 +637,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/wood{ planetary_atmos = 1 }, @@ -785,9 +777,7 @@ }, /area/hangar) "CJ" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, diff --git a/_maps/outpost/hangar/nt_asteroid_56x40.dmm b/_maps/outpost/hangar/nt_asteroid_56x40.dmm index cbf9cb601cbf..a3018e28aa32 100644 --- a/_maps/outpost/hangar/nt_asteroid_56x40.dmm +++ b/_maps/outpost/hangar/nt_asteroid_56x40.dmm @@ -13,9 +13,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/carpet/red{ planetary_atmos = 1 }, @@ -50,9 +48,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/wood{ planetary_atmos = 1 }, @@ -365,9 +361,7 @@ }, /area/hangar) "pK" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /turf/open/floor/concrete/reinforced{ planetary_atmos = 1 }, @@ -616,9 +610,7 @@ }, /area/hangar) "zl" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /obj/machinery/light/directional/east, /turf/open/floor/concrete/reinforced{ planetary_atmos = 1 @@ -993,9 +985,7 @@ /turf/open/water/beach/deep, /area/hangar) "LM" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, diff --git a/_maps/outpost/hangar/nt_ice_40x40.dmm b/_maps/outpost/hangar/nt_ice_40x40.dmm index c2b6ae69926f..f2f644dd7dda 100644 --- a/_maps/outpost/hangar/nt_ice_40x40.dmm +++ b/_maps/outpost/hangar/nt_ice_40x40.dmm @@ -526,10 +526,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/structure/chair/comfy/brown{ - dir = 8; - pixel_x = 6 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/machinery/light/small/directional/east, /turf/open/floor/plating{ planetary_atmos = 1 diff --git a/_maps/outpost/hangar/nt_ice_56x40.dmm b/_maps/outpost/hangar/nt_ice_56x40.dmm index 07374d3394f8..90841c2cf6a1 100644 --- a/_maps/outpost/hangar/nt_ice_56x40.dmm +++ b/_maps/outpost/hangar/nt_ice_56x40.dmm @@ -1026,10 +1026,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/structure/chair/comfy/brown{ - dir = 8; - pixel_x = 6 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/machinery/light/small/directional/east, /turf/open/floor/plating{ planetary_atmos = 1 diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm index 7d7ad5ecb653..d7debf2a5dc7 100644 --- a/_maps/outpost/indie_space.dmm +++ b/_maps/outpost/indie_space.dmm @@ -2398,9 +2398,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/fore) "qg" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/royalblack, /area/outpost/crew/bar) @@ -3227,9 +3225,7 @@ /turf/open/floor/wood, /area/outpost/crew/bar) "ur" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/corner/directional/west, /turf/open/floor/carpet/royalblack, /area/outpost/crew/bar) "uu" = ( @@ -3827,9 +3823,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/central) "yh" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/machinery/light/small/directional/west, /turf/open/floor/carpet/green, /area/outpost/crew/bar) @@ -4917,7 +4911,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/central) "EV" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, @@ -5187,7 +5181,7 @@ /turf/open/floor/plasteel/tech, /area/outpost/hallway/port) "GE" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /obj/effect/turf_decal/siding/wood, /obj/structure/sign/poster/random{ pixel_y = 30 @@ -5753,9 +5747,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/fore) "JM" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /turf/open/floor/carpet/green, /area/outpost/crew/bar) "JS" = ( @@ -6460,9 +6452,7 @@ /turf/open/floor/grass/ship/jungle, /area/outpost/hallway/port) "Oh" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /turf/open/floor/carpet/royalblack, /area/outpost/crew/bar) "Oi" = ( @@ -6481,9 +6471,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/fore) "Or" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/royalblack, /area/outpost/crew/bar) @@ -6635,9 +6623,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/fore) "PD" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /turf/open/floor/carpet/royalblack, /area/outpost/crew/bar) "PF" = ( @@ -7204,9 +7190,7 @@ /obj/structure/sign/painting/library_private{ pixel_y = -26 }, -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/outpost/crew/library) @@ -7776,7 +7760,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/fore) "VW" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/outpost/crew/bar) @@ -8121,9 +8105,7 @@ /turf/open/floor/plasteel/elevatorshaft, /area/outpost/security) "XW" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -8221,7 +8203,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/central) "YD" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/machinery/light/small/directional/east, /turf/open/floor/carpet/green, /area/outpost/crew/bar) diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index 02d44702bc23..a55df014f4f9 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -816,10 +816,9 @@ /turf/open/floor/plating/rust, /area/outpost/maintenance/aft) "di" = ( -/obj/structure/chair/comfy/brown{ +/obj/structure/chair/comfy/orange/directional/west{ buildstackamount = 0; - color = "#c45c57"; - dir = 8 + color = "#c45c57" }, /turf/open/floor/plasteel, /area/outpost/vacant_rooms) @@ -1625,9 +1624,7 @@ }, /area/outpost/hallway/fore) "gd" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/plasteel/dark, /area/outpost/operations) "ge" = ( @@ -2436,9 +2433,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/aft) "jm" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -3625,7 +3620,7 @@ /turf/open/floor/plasteel, /area/outpost/vacant_rooms) "nk" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -3958,9 +3953,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/firealarm/directional/west, /turf/open/floor/concrete/tiles, /area/outpost/hallway/aft) @@ -4048,9 +4041,7 @@ /turf/open/floor/plasteel/dark, /area/outpost/operations) "oZ" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /turf/open/floor/plasteel/sepia, /area/outpost/crew/canteen) "pa" = ( @@ -4090,9 +4081,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -4224,7 +4213,7 @@ /turf/open/floor/plasteel/telecomms_floor, /area/outpost/crew/cryo) "pG" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -5562,9 +5551,7 @@ /turf/open/floor/wood, /area/outpost/operations) "tN" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /turf/open/floor/plasteel/sepia, /area/outpost/crew/canteen) "tO" = ( @@ -5620,18 +5607,14 @@ /turf/open/floor/plasteel/patterned/grid, /area/outpost/hallway/fore) "tY" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /obj/structure/sign/poster/official/moth/epi{ pixel_x = -32 }, /turf/open/floor/plasteel/sepia, /area/outpost/crew/canteen) "tZ" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/machinery/button/door{ dir = 4; pixel_x = -28; @@ -6372,9 +6355,7 @@ /turf/open/floor/concrete/slab_3, /area/outpost/hallway/starboard) "wy" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -6664,9 +6645,7 @@ /turf/open/floor/wood, /area/outpost/hallway/central) "xv" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/structure/sign/poster/contraband/free_tonto{ pixel_y = -32 }, @@ -7319,9 +7298,7 @@ /turf/open/floor/plating/rust, /area/outpost/maintenance/fore) "zG" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/machinery/light/directional/west, /obj/effect/decal/cleanable/vomit/old{ pixel_x = 7; @@ -7348,9 +7325,7 @@ /turf/open/floor/concrete/slab_3, /area/outpost/hallway/central) "zK" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/item/toy/plush/moth, /turf/open/floor/plasteel/dark, /area/outpost/operations) @@ -7795,7 +7770,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/food/flour, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/item/toy/figure/botanist{ pixel_x = 2 }, @@ -8134,7 +8109,7 @@ }, /area/outpost/operations) "Cw" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 5 }, @@ -8626,9 +8601,7 @@ /turf/open/floor/concrete/slab_1, /area/outpost/crew/library) "En" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/outpost/security) @@ -9347,9 +9320,7 @@ /turf/open/floor/plasteel/dark, /area/outpost/crew/cryo) "GG" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/effect/decal/cleanable/vomit/old{ pixel_y = 7 }, @@ -9675,9 +9646,7 @@ /turf/open/floor/plasteel/tech, /area/outpost/crew/cryo) "HS" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/item/toy/plush/beeplushie, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -10988,7 +10957,7 @@ /turf/open/floor/carpet, /area/outpost/crew/dorm) "Mp" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /turf/open/floor/plasteel/dark, /area/outpost/operations) "Mq" = ( @@ -11064,9 +11033,7 @@ /turf/open/floor/concrete/tiles, /area/outpost/hallway/aft) "MO" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/machinery/light/directional/south, /turf/open/floor/plasteel/sepia, /area/outpost/crew/canteen) @@ -12312,9 +12279,7 @@ /turf/open/floor/plasteel/dark, /area/outpost/security) "QM" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/effect/decal/cleanable/wrapping, /turf/open/floor/wood, /area/outpost/crew/library) @@ -12875,9 +12840,7 @@ /turf/open/floor/plasteel/sepia, /area/outpost/crew/canteen) "SW" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/decal/cleanable/robot_debris/gib{ pixel_x = -13 }, @@ -13143,9 +13106,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -13768,9 +13729,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/machinery/light/directional/south, /obj/machinery/newscaster/directional/east, /turf/open/floor/wood, @@ -14903,9 +14862,7 @@ /turf/open/floor/grass, /area/outpost/hallway/fore) "ZR" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 1 }, diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm index 76614b56e452..696342178b2d 100644 --- a/_maps/outpost/nanotrasen_ice.dmm +++ b/_maps/outpost/nanotrasen_ice.dmm @@ -874,10 +874,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/outpost/security) "ga" = ( -/obj/structure/chair/comfy/brown{ - dir = 1; - pixel_y = 4 - }, +/obj/structure/chair/comfy/orange/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/walnut, /area/outpost/crew/lounge) @@ -1015,10 +1012,7 @@ /turf/open/floor/wood/walnut, /area/outpost/crew/bar) "hJ" = ( -/obj/structure/chair/comfy/brown{ - dir = 4; - pixel_x = -4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/machinery/light/dim/directional/west{ bulb_power = 0.7 }, diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index 65df51cb9735..f1595e0ffaa1 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -456,9 +456,7 @@ /turf/open/floor/plasteel/sepia, /area/ship/crew/canteen) "ev" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -970,9 +968,7 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "iX" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/effect/landmark/start/depsec, /turf/open/floor/plasteel/dark, /area/ship/security) @@ -1036,7 +1032,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ship/crew/canteen) @@ -2948,9 +2944,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/item/radio/intercom/directional/east, /obj/machinery/light_switch{ pixel_x = 23; @@ -3683,9 +3677,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ship/crew/canteen) @@ -3850,7 +3842,7 @@ /turf/open/floor/carpet/red, /area/ship/crew) "Ku" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/open/floor/wood, /area/ship/crew/canteen) "Kx" = ( @@ -3858,9 +3850,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood/corner, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/wood, /area/ship/crew/library) "KI" = ( @@ -4107,9 +4097,7 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "MZ" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/east, /obj/machinery/light_switch{ @@ -4903,10 +4891,9 @@ /turf/open/floor/plating, /area/ship/engineering) "Wo" = ( -/obj/structure/chair/comfy/brown{ +/obj/structure/chair/comfy/orange/directional/south{ buildstackamount = 0; - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /obj/effect/landmark/start/assistant, /turf/open/floor/wood/walnut, diff --git a/_maps/shuttles/independent/independent_boyardee.dmm b/_maps/shuttles/independent/independent_boyardee.dmm index 7d6fb95b99da..4ae94900b258 100644 --- a/_maps/shuttles/independent/independent_boyardee.dmm +++ b/_maps/shuttles/independent/independent_boyardee.dmm @@ -858,9 +858,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /turf/open/floor/wood, /area/ship/crew/canteen) "qE" = ( @@ -906,9 +904,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /turf/open/floor/wood, /area/ship/crew/canteen) "rm" = ( @@ -2674,9 +2670,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /turf/open/floor/wood, /area/ship/crew/canteen) "WH" = ( diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 6150fe8877ec..262ac034dc5a 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -742,9 +742,7 @@ /obj/machinery/light/small/directional/north, /obj/machinery/computer/helm/viewscreen/directional/east, /obj/effect/landmark/start/assistant, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /turf/open/floor/wood, /area/ship/crew) "pS" = ( @@ -2004,9 +2002,7 @@ /turf/open/floor/plating, /area/ship/construction) "Tl" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /turf/open/floor/plasteel/grimy, /area/ship/crew) "TP" = ( diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm index b9c686406b14..a4c390afde8d 100644 --- a/_maps/shuttles/independent/independent_kilo.dmm +++ b/_maps/shuttles/independent/independent_kilo.dmm @@ -653,10 +653,9 @@ /turf/open/floor/carpet, /area/ship/crew) "da" = ( -/obj/structure/chair/comfy/brown{ +/obj/structure/chair/comfy/orange/directional/north{ buildstackamount = 0; - color = "#c45c57"; - dir = 1 + color = "#c45c57" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/status_display{ @@ -1228,7 +1227,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /turf/open/floor/wood{ icon_state = "wood-broken3" }, @@ -1437,9 +1436,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 2 }, -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /turf/open/floor/wood{ icon_state = "wood-broken6" }, @@ -1611,7 +1608,7 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/machinery/firealarm/directional/north, /obj/machinery/light/small/directional/east, /turf/open/floor/wood{ diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm index f1f68c199fa4..7e96d8f93b53 100644 --- a/_maps/shuttles/independent/independent_lagoon.dmm +++ b/_maps/shuttles/independent/independent_lagoon.dmm @@ -535,9 +535,7 @@ /area/ship/hallway/starboard) "dq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -1018,9 +1016,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/port) "gM" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/grass, /area/ship/hallway/central) "gR" = ( @@ -1521,9 +1517,7 @@ /turf/open/floor/carpet/black, /area/ship/crew/library) "jP" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/machinery/newscaster/directional/east, /turf/open/floor/carpet/black, /area/ship/crew/office) @@ -1704,9 +1698,7 @@ /turf/open/floor/carpet/black, /area/ship/crew/office) "ll" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/library) @@ -2020,9 +2012,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 10 }, @@ -2030,7 +2020,7 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "mV" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /turf/open/floor/carpet/nanoweave/blue, /area/ship/hallway/fore) "na" = ( @@ -2478,8 +2468,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "qa" = ( -/obj/structure/chair/sofa{ - dir = 4; +/obj/structure/chair/sofa/brown/directional/east{ icon_state = "sofacorner" }, /turf/open/floor/carpet/nanoweave/blue, @@ -3051,9 +3040,7 @@ /area/ship/hallway/aft) "uf" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/item/radio/intercom/directional/north, /turf/open/floor/grass, /area/ship/hallway/central) @@ -3230,8 +3217,7 @@ /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "vB" = ( -/obj/structure/chair/sofa{ - dir = 4; +/obj/structure/chair/sofa/brown/directional/east{ icon_state = "sofaend_right" }, /turf/open/floor/carpet/nanoweave/blue, @@ -3512,9 +3498,7 @@ /turf/open/floor/pod/dark, /area/ship/hallway/fore) "xo" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -4549,9 +4533,7 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "Et" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/carpet/black, /area/ship/crew/office) "Eu" = ( @@ -4775,9 +4757,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "FP" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -5076,9 +5056,7 @@ dir = 8; pixel_x = -1 }, -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -5088,7 +5066,7 @@ /turf/open/floor/wood, /area/ship/crew) "HW" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /turf/open/floor/carpet/black, /area/ship/crew/office) "Ie" = ( @@ -5511,9 +5489,7 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "Lu" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /turf/open/floor/wood, /area/ship/crew/dorm) "LA" = ( @@ -5696,9 +5672,7 @@ dir = 8; pixel_x = -1 }, -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -5708,9 +5682,7 @@ /turf/open/floor/wood, /area/ship/crew) "Np" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/item/radio/intercom/directional/west, /turf/open/floor/carpet/black, /area/ship/crew/office) @@ -6399,7 +6371,7 @@ /turf/open/floor/wood, /area/ship/crew/hydroponics) "Rw" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -6654,9 +6626,7 @@ /turf/open/floor/wood, /area/ship/crew/library) "Tx" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -6810,7 +6780,7 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "Ui" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/open/floor/carpet/nanoweave/blue, /area/ship/hallway/fore) "Um" = ( @@ -7159,9 +7129,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "WB" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/dorm) @@ -7395,9 +7363,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "Yc" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 10 }, diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm index 13b336dc36ae..daf3cf9ecdb3 100644 --- a/_maps/shuttles/independent/independent_rigger.dmm +++ b/_maps/shuttles/independent/independent_rigger.dmm @@ -390,9 +390,7 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "fn" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /turf/open/floor/plasteel/grimy, /area/ship/crew) "fp" = ( @@ -3153,9 +3151,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/tech/techmaint, /area/ship/hallway/central) @@ -3671,9 +3667,7 @@ /area/ship/maintenance/central) "Sa" = ( /obj/machinery/light/directional/south, -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /turf/open/floor/plasteel/grimy, /area/ship/crew) "Sh" = ( diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm index a77e943f1558..454e7503cb52 100644 --- a/_maps/shuttles/independent/independent_schmiedeberg.dmm +++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm @@ -490,9 +490,7 @@ /turf/open/floor/plasteel/white, /area/ship/cargo) "fS" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -726,9 +724,7 @@ /turf/open/floor/carpet/blue, /area/ship/bridge) "iX" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/effect/turf_decal/siding/thinplating/light{ dir = 10 }, @@ -2375,9 +2371,7 @@ /area/ship/cargo) "KK" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/item/toy/plush/snakeplushie, /turf/open/floor/carpet/blue, /area/ship/crew) diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm index 3d5fa7c58420..13599cc298cf 100644 --- a/_maps/shuttles/independent/independent_shetland.dmm +++ b/_maps/shuttles/independent/independent_shetland.dmm @@ -440,7 +440,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "ec" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "ee" = ( @@ -923,7 +923,7 @@ /turf/open/floor/plating, /area/ship/hallway/fore) "hP" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "hX" = ( diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm index d39a1ef392e3..1ac7b7fb0d33 100644 --- a/_maps/shuttles/independent/independent_tranquility.dmm +++ b/_maps/shuttles/independent/independent_tranquility.dmm @@ -348,9 +348,7 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/hallway/port) "dp" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -411,9 +409,7 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/hallway/port) "dV" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ color = "#792f27"; @@ -710,9 +706,7 @@ /turf/open/floor/wood, /area/ship/crew/dorm/dormfive) "fK" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /obj/machinery/firealarm/directional/west, /obj/structure/sign/poster/official/the_owl{ pixel_y = -32 @@ -818,9 +812,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/hydroponics) "gk" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -1462,7 +1454,7 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/hallway/port) "kC" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -1667,9 +1659,7 @@ /turf/open/floor/carpet/green, /area/ship/crew) "mK" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/effect/turf_decal/siding/wood/corner{ color = "#792f27"; dir = 8 @@ -1716,9 +1706,7 @@ }, /area/ship/hallway/port) "nc" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/turf_decal/siding/wood/corner{ color = "#792f27" }, @@ -1834,9 +1822,7 @@ pixel_x = -26; pixel_y = 6 }, -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /turf/open/floor/carpet, /area/ship/crew/crewfive) "oS" = ( @@ -2364,7 +2350,7 @@ /turf/open/floor/plasteel, /area/ship/crew/cryo) "tA" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -2917,9 +2903,7 @@ /turf/open/floor/wood, /area/ship/crew/hydroponics) "xT" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /turf/open/floor/carpet, /area/ship/crew/crewfive) "xU" = ( @@ -2960,7 +2944,7 @@ /area/ship/engineering/engine) "yg" = ( /obj/machinery/light/directional/north, -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/effect/turf_decal/siding/wood{ color = "#792f27"; dir = 1 @@ -3208,9 +3192,7 @@ /turf/open/floor/plasteel, /area/ship/crew/cryo) "Aa" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/corner/directional/west, /obj/machinery/camera/autoname{ dir = 9 }, @@ -3379,7 +3361,7 @@ /turf/open/floor/plasteel, /area/ship/crew/cryo) "BE" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/machinery/light/dim/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -3671,9 +3653,7 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/hallway/port) "DD" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/walnut, /area/ship/crew) @@ -3849,9 +3829,7 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/crewfour) "Fk" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/corner/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -3987,9 +3965,7 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm/dormthree) "Go" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet, /area/ship/crew/crewfive) @@ -4199,9 +4175,7 @@ /turf/open/floor/wood/birch, /area/ship/crew/crewfive) "HJ" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /turf/open/floor/carpet, /area/ship/crew/crewfive) "HP" = ( @@ -4276,9 +4250,7 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/hallway/port) "Ij" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/corner/directional/west, /obj/machinery/camera/autoname{ dir = 9 }, @@ -4592,9 +4564,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "KF" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /turf/open/floor/carpet, /area/ship/crew/crewfive) "KI" = ( @@ -4651,7 +4621,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/crewfour) "KX" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -4680,9 +4650,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "Lp" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/structure/sign/poster/retro/pdaancient{ pixel_y = -32 }, @@ -4807,9 +4775,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/crewfour) "Me" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/item/radio/intercom/directional/south, /turf/open/floor/carpet, /area/ship/crew/crewfive) @@ -5083,9 +5049,7 @@ /turf/open/floor/plasteel, /area/ship/crew/cryo) "Om" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /mob/living/simple_animal/parrot/Polly{ name = "Pollyphema" }, @@ -5223,7 +5187,7 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/hallway/starboard) "Px" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/structure/sign/poster/official/high_class_martini{ pixel_y = 32 }, @@ -5253,7 +5217,7 @@ /turf/open/floor/plasteel, /area/ship/crew/cryo) "PH" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -5486,9 +5450,7 @@ /turf/open/floor/grass, /area/ship/crew/hydroponics) "QZ" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/machinery/light/dim/directional/south, /turf/open/floor/carpet, /area/ship/crew/crewfive) @@ -5562,9 +5524,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "RL" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/walnut, /area/ship/crew) @@ -5938,9 +5898,7 @@ /area/ship/crew/dorm/dormthree) "Up" = ( /obj/machinery/light/directional/north, -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/effect/turf_decal/siding/wood{ color = "#792f27"; dir = 1 @@ -5971,9 +5929,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/dorm) "UG" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/effect/turf_decal/siding/wood{ color = "#792f27" }, @@ -6099,7 +6055,7 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "Vk" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/effect/turf_decal/siding/wood{ color = "#792f27"; dir = 1 diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index e8baced58968..d5ed70873819 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -3203,9 +3203,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Kv" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 4234e39cbafc..45ecbf33d0a7 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -65,9 +65,7 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 }, -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/machinery/status_display/shuttle{ pixel_x = 32 }, @@ -1684,7 +1682,7 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 }, -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/machinery/light_switch{ pixel_y = 22 }, @@ -2310,7 +2308,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/landmark/start/assistant, /obj/machinery/camera/autoname, /obj/machinery/status_display/shuttle{ @@ -2897,9 +2895,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "rw" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/plating, /area/ship/maintenance/starboard) "rB" = ( @@ -5981,7 +5977,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/grimy, /area/ship/crew) @@ -6885,9 +6881,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/carpet/orange, /area/ship/bridge) "Tq" = ( diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 89c80e0e363a..5dea1c030e20 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -895,9 +895,7 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 6 }, -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/structure/closet/firecloset/wall/directional/south, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) @@ -1085,9 +1083,7 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 10 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) @@ -2822,9 +2818,7 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 8 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/machinery/computer/helm/viewscreen/directional/west, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) @@ -4360,9 +4354,7 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 4 }, -/obj/structure/chair/sofa/right{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/right/directional/west, /obj/structure/closet/emcloset/wall/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 23e763a6b9c6..927f372ab3c5 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -1180,7 +1180,7 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "sS" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/grimy, /area/ship/crew) @@ -2994,7 +2994,7 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/maintenance/port) "VD" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/item/radio/intercom/directional/north, /obj/effect/decal/cleanable/dirt/dust, /obj/item/trash/popcorn, diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm index 8525a9d297bb..a2862a4ac6d5 100644 --- a/_maps/shuttles/minutemen/minutemen_vela.dmm +++ b/_maps/shuttles/minutemen/minutemen_vela.dmm @@ -2631,9 +2631,7 @@ /turf/open/floor/circuit/green, /area/ship/science/ai_chamber) "pw" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/decal/cleanable/wrapping, /turf/open/floor/carpet, /area/ship/crew) @@ -3079,9 +3077,7 @@ /turf/open/floor/plasteel/dark, /area/ship/cargo) "rw" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/light/small/directional/west, /obj/item/kirbyplants{ icon_state = "plant-22"; @@ -3880,9 +3876,7 @@ /turf/open/floor/plasteel/dark, /area/ship/science) "vM" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/machinery/firealarm/directional/east, /turf/open/floor/carpet, /area/ship/crew) @@ -4696,7 +4690,7 @@ /turf/open/floor/carpet, /area/ship/crew) "zK" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/item/radio/intercom/directional/east, /obj/item/toy/plush/hornet{ pixel_y = 7 @@ -5027,9 +5021,7 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Br" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/wood, /area/ship/crew/office) "Bu" = ( @@ -5082,7 +5074,7 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "BH" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -5141,7 +5133,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "BX" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/machinery/newscaster/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -5529,9 +5521,7 @@ /turf/open/floor/plasteel/dark, /area/ship/cargo) "En" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /obj/machinery/light/small/directional/east, /turf/open/floor/carpet, /area/ship/crew) @@ -8619,7 +8609,7 @@ /turf/open/floor/wood, /area/ship/hallway/fore) "Ve" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/item/radio/intercom/directional/north, /turf/open/floor/carpet, /area/ship/crew) @@ -8699,7 +8689,7 @@ /turf/open/floor/carpet/nanoweave/purple, /area/ship/science) "VO" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/machinery/light/small/directional/west, /turf/open/floor/carpet, /area/ship/crew) @@ -9400,9 +9390,7 @@ /turf/open/floor/plasteel/dark, /area/ship/science) "Zj" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/structure/sign/poster/clip/random{ pixel_x = -28 }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 4fa6a4424482..28a59c22727b 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -403,9 +403,7 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "bE" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /turf/open/floor/carpet/green, /area/ship/crew/dorm) "bF" = ( @@ -2492,9 +2490,8 @@ /turf/open/floor/wood, /area/ship/science/robotics) "jO" = ( -/obj/structure/chair/comfy/brown{ - color = "#c45c57"; - dir = 4 +/obj/structure/chair/comfy/orange/directional/east{ + color = "#c45c57" }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/nanoweave, @@ -3441,9 +3438,7 @@ /turf/open/floor/grass, /area/ship/hallway/aft) "mM" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /obj/machinery/light/small/directional/west, /turf/open/floor/carpet/green, /area/ship/crew/dorm) @@ -6634,7 +6629,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "ym" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/turf_decal/siding/thinplating{ dir = 5 }, @@ -8027,7 +8022,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "DW" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/red, /area/ship/security) @@ -8138,9 +8133,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -8250,7 +8243,7 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/electrical) "Et" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, @@ -9565,7 +9558,7 @@ /obj/effect/turf_decal/trimline/opaque/blue/line{ dir = 1 }, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/structure/sign/poster/official/moth{ pixel_y = 32 }, @@ -9895,7 +9888,7 @@ /turf/open/floor/plating, /area/ship/bridge) "KQ" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/decal/cleanable/blood/old, /obj/item/toy/plush/moth{ pixel_x = 3 @@ -10075,9 +10068,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hangar) "LO" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/effect/decal/cleanable/dirt, /obj/item/toy/plush/hornet/gay{ layer = 2.1; @@ -11088,7 +11079,7 @@ }, /area/ship/crew/office) "Pp" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/item/toy/plush/spider, /turf/open/floor/carpet/green, /area/ship/crew/dorm) @@ -11528,7 +11519,7 @@ /obj/effect/turf_decal/trimline/opaque/blue/line{ dir = 1 }, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plasteel, /area/ship/hallway/fore) @@ -12681,9 +12672,7 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Vo" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/machinery/firealarm/directional/west, /obj/item/radio/intercom/directional/west, /turf/open/floor/carpet/green, @@ -12980,9 +12969,7 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/dorm) "WU" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /obj/machinery/newscaster/directional/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/west, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm index 117d575d366a..9abfe4c6c6cb 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm @@ -848,9 +848,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, /obj/structure/sign/poster/contraband/random{ @@ -862,7 +860,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, @@ -871,7 +869,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/machinery/computer/helm/viewscreen/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, @@ -1024,9 +1022,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/airalarm/directional/west, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, @@ -1900,9 +1896,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/item/radio/intercom/directional/west, /turf/open/floor/wood, @@ -2803,7 +2797,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/ship/crew/canteen/kitchen) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm index beee568b9a48..ad4889732fad 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm @@ -192,7 +192,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/dorm/dormthree) "bo" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/item/toy/plush/beeplushie, /obj/effect/turf_decal/spline/plain/opaque/blue{ dir = 1 @@ -456,9 +456,7 @@ /turf/closed/wall/rust, /area/ship/crew/hydroponics) "cO" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /obj/item/toy/plush/slimeplushie{ pixel_x = 6 }, @@ -1420,7 +1418,7 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "id" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/machinery/light/directional/east, /obj/effect/turf_decal/spline/plain/opaque/blue{ dir = 1 @@ -2168,7 +2166,7 @@ /area/ship/crew/toilet) "mj" = ( /obj/item/storage/backpack/satchel/flat/mimir_jackets, -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /turf/open/floor/plasteel/dark, /area/ship/security/armory) "mk" = ( @@ -2491,9 +2489,7 @@ /turf/template_noop, /area/template_noop) "ob" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/turf_decal/spline/plain/opaque/blue, /turf/open/floor/plasteel, /area/ship/security/prison) @@ -2972,9 +2968,7 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "qO" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /turf/open/floor/carpet/red, /area/ship/crew/dorm/dormthree) "qR" = ( @@ -4175,9 +4169,7 @@ /turf/open/floor/plating, /area/ship/maintenance/fore) "yN" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /obj/item/toy/plush/among, /turf/open/floor/plasteel, /area/ship/security/prison) @@ -5315,9 +5307,7 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Fn" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/machinery/light/directional/south, /turf/open/floor/carpet/red, /area/ship/crew/dorm/dormthree) @@ -5853,9 +5843,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/starboard) "HZ" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /turf/open/floor/carpet/red, /area/ship/crew/dorm/dormthree) "Ib" = ( @@ -5899,9 +5887,7 @@ /area/ship/hallway/central) "Ik" = ( /obj/item/storage/backpack/satchel/flat/mimir_tech, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormfive) "Is" = ( @@ -6038,9 +6024,7 @@ /turf/open/floor/plasteel, /area/ship/crew/dorm/dormthree) "Jc" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /obj/machinery/light/directional/west, /turf/open/floor/carpet/red, /area/ship/crew/dorm/dormthree) @@ -7958,9 +7942,7 @@ /turf/open/floor/plating, /area/ship/maintenance/fore) "Uw" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /obj/machinery/light_switch{ pixel_x = 8; pixel_y = -22; diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index 398fcebfbfb7..6af78349def1 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ac" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /obj/structure/closet/secure_closet/wall/directional/west{ icon_door = "sec_wall"; icon_state = "sec_wall"; @@ -5702,7 +5700,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) "KL" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ @@ -7345,9 +7343,7 @@ /turf/open/floor/plasteel/dark, /area/ship/science) "VF" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/effect/landmark/start/captain, /obj/machinery/airalarm/directional/west, /obj/structure/sign/poster/retro/lasergun_new{ @@ -7469,9 +7465,7 @@ /turf/template_noop, /area/template_noop) "Ws" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/effect/landmark/start/head_of_personnel, /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/blue, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm index 7605fa6433cd..b597d12f69e0 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -576,9 +576,7 @@ /turf/closed/wall/r_wall, /area/ship/crew/toilet) "gh" = ( -/obj/structure/chair/comfy/teal{ - dir = 4 - }, +/obj/structure/chair/comfy/blue/directional/east, /obj/item/toy/plush/moth/lovers, /obj/item/radio/intercom/directional/north, /turf/open/floor/circuit/green/airless, @@ -1435,7 +1433,7 @@ /turf/open/floor/plating, /area/ship/engineering) "ox" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/machinery/light/dim/directional/east, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) @@ -1571,9 +1569,7 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "pL" = ( -/obj/structure/chair/comfy/teal{ - dir = 4 - }, +/obj/structure/chair/comfy/blue/directional/east, /obj/item/toy/plush/moth/royal, /obj/item/radio/intercom/wideband/directional/south, /turf/open/floor/circuit/green/airless, @@ -3264,9 +3260,7 @@ /turf/open/floor/circuit/green/airless, /area/ship/engineering/communications) "IM" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /obj/item/toy/plush/blahaj{ layer = 3.1 }, @@ -4049,9 +4043,7 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/port) "RM" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "RS" = ( @@ -4455,7 +4447,7 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "Wv" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/item/toy/plush/goatplushie{ layer = 3.1 }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm index 803c5f0ea0c2..7d7ef4ddf1db 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm @@ -255,9 +255,7 @@ /turf/open/floor/carpet/nanoweave, /area/ship/hallway/central) "cF" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/wood, /area/ship/hallway/central) "cJ" = ( @@ -599,9 +597,7 @@ /turf/open/floor/carpet/nanoweave/blue, /area/ship/crew/office) "eP" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ship/crew/dorm) @@ -806,9 +802,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "fI" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/machinery/newscaster/directional/east, /turf/open/floor/carpet/red, /area/ship/hallway/central) @@ -1274,9 +1268,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/cargo/office) "iP" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/structure/cable{ icon_state = "2-4" }, @@ -2559,9 +2551,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/wood, /area/ship/crew/dorm) "ul" = ( @@ -3018,7 +3008,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "xs" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/machinery/light/directional/north, /turf/open/floor/carpet/red, /area/ship/hallway/central) @@ -3068,9 +3058,7 @@ /area/ship/engineering/atmospherics) "xW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/wood, /area/ship/crew/cryo) "yf" = ( @@ -3303,9 +3291,7 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "Aa" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-2" @@ -3630,9 +3616,7 @@ /turf/open/floor/engine, /area/ship/engineering/atmospherics) "CH" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/nanoweave/blue, /area/ship/medical) @@ -3753,7 +3737,7 @@ /turf/open/floor/carpet/nanoweave, /area/ship/hallway/central) "DV" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -5298,9 +5282,7 @@ /area/ship/engineering/atmospherics) "Th" = ( /obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/structure/cable{ icon_state = "0-4" }, @@ -5914,7 +5896,7 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Yx" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 23 diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index e39ca5bb9654..f06f4e5dbc66 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -1213,9 +1213,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "jv" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/machinery/camera/autoname{ dir = 4 @@ -1938,9 +1936,7 @@ /turf/open/floor/vault, /area/ship/security) "qC" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/effect/turf_decal/spline/fancy/opaque/lime{ dir = 6 }, @@ -2028,9 +2024,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "rj" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/machinery/light_switch{ dir = 4; @@ -4175,9 +4169,7 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Hv" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/machinery/light/directional/south, /turf/open/floor/plasteel/dark, @@ -6384,9 +6376,7 @@ /turf/open/floor/plating, /area/ship/engineering/engines/port) "Yo" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/dark, diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm index 5bec6898af92..93d276197563 100644 --- a/_maps/shuttles/pirate/pirate_ember.dmm +++ b/_maps/shuttles/pirate/pirate_ember.dmm @@ -1065,7 +1065,7 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ship/security/range) "fD" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/pet/penguin/emperor, /turf/open/floor/carpet/nanoweave, @@ -6780,9 +6780,7 @@ /turf/closed/wall/r_wall/rust, /area/ship/bridge) "Gr" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -8496,9 +8494,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ship/security) diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm index 6d1a743dc6a0..ff5841d98df5 100644 --- a/_maps/shuttles/roumain/srm_elder.dmm +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -1299,9 +1299,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /turf/open/floor/wood/maple, /area/ship/hallway/port) "pd" = ( @@ -1836,9 +1834,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/wood/maple, /area/ship/hallway/port) "wm" = ( @@ -2162,9 +2158,7 @@ /turf/open/floor/grass/ship/jungle, /area/ship/bridge) "AY" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/structure/railing{ dir = 8 }, @@ -3866,9 +3860,7 @@ /turf/open/floor/wood/maple, /area/ship/hallway/central) "Wy" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/structure/railing{ dir = 4 }, diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm index c790d8a67b7c..d0359b5ca240 100644 --- a/_maps/shuttles/solgov/solgov_chronicle.dmm +++ b/_maps/shuttles/solgov/solgov_chronicle.dmm @@ -1428,9 +1428,7 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "nH" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/newscaster/directional/west, /turf/open/floor/carpet/blue, /area/ship/crew) @@ -2359,9 +2357,7 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "yj" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/carpet/blue, /area/ship/crew) @@ -2606,9 +2602,7 @@ /turf/open/floor/wood, /area/ship/crew) "zv" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /obj/machinery/light/small/directional/west, /turf/open/floor/carpet/blue, /area/ship/crew) @@ -3561,7 +3555,7 @@ /turf/open/floor/wood/walnut, /area/ship/bridge) "Ja" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/ship/crew) @@ -4023,7 +4017,7 @@ /turf/open/floor/plating, /area/ship/crew/crewtwo) "Nz" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/open/floor/carpet/blue, /area/ship/crew) "NH" = ( diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm index c64c73a5f191..f10400bb387c 100644 --- a/_maps/shuttles/solgov/solgov_inkwell.dmm +++ b/_maps/shuttles/solgov/solgov_inkwell.dmm @@ -1471,9 +1471,7 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "jX" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/left/directional/west, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/blue, /area/ship/crew/canteen/kitchen) @@ -2414,9 +2412,7 @@ color = "#D5A66E"; dir = 10 }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/chair/comfy/orange/directional/west, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew/dorm/dormthree) @@ -3724,7 +3720,7 @@ /turf/open/floor/plasteel/patterned/ridged, /area/ship/cargo) "xP" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/brown/right/directional/south, /obj/machinery/airalarm/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/blue, @@ -4394,9 +4390,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/orange/directional/east, /turf/open/floor/wood, /area/ship/bridge) "Cq" = ( @@ -4540,9 +4534,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "Dt" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, +/obj/structure/chair/sofa/brown/directional/west, /turf/open/floor/carpet/blue, /area/ship/crew/canteen/kitchen) "Du" = ( @@ -4769,7 +4761,7 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "EF" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/brown/directional/south, /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/blue, @@ -5135,7 +5127,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "Ho" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/walnut, @@ -5874,7 +5866,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/starboard) "My" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/brown/corner/directional/south, /obj/item/radio/intercom/directional/north, /turf/open/floor/carpet/blue, /area/ship/crew/canteen/kitchen) diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm index ba1181c14daa..1eb02eac6a21 100644 --- a/_maps/shuttles/solgov/solgov_paracelsus.dmm +++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm @@ -10,7 +10,7 @@ /turf/open/floor/wood, /area/ship/bridge) "an" = ( -/obj/structure/chair/comfy/brown, +/obj/structure/chair/comfy/orange/directional/south, /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light_switch{ pixel_x = 11; @@ -200,9 +200,7 @@ /turf/open/floor/wood/ebony, /area/ship/crew/office) "cg" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/carpet/royalblue, @@ -1341,9 +1339,7 @@ id = "sg_par_office"; name = "shutter control" }, -/obj/structure/chair/sofa/left{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/left/directional/north, /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) @@ -1851,9 +1847,7 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "rT" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) @@ -1864,9 +1858,7 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/crewtwo) "sb" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/machinery/light/small/directional/west, /turf/open/floor/wood/yew, /area/ship/crew) @@ -2406,9 +2398,7 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "xk" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/left/directional/east, /obj/machinery/light/directional/west, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) @@ -4011,9 +4001,7 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo/office) "MF" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "ML" = ( @@ -4487,9 +4475,7 @@ /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "QQ" = ( -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) @@ -4622,16 +4608,12 @@ /turf/open/floor/wood/mahogany, /area/ship/bridge) "RS" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/machinery/airalarm/directional/west, /turf/open/floor/wood/yew, /area/ship/crew) "Sa" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /obj/machinery/firealarm/directional/south, /obj/item/radio/intercom/directional/west, /turf/open/floor/carpet/royalblue, diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index e879c978eef0..e001e89d1383 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -1161,9 +1161,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/directional/east, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "iv" = ( @@ -1732,9 +1730,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/corner{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/corner/directional/north, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "or" = ( @@ -2269,7 +2265,7 @@ /area/ship/hallway/central) "up" = ( /obj/machinery/light/directional/north, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "uA" = ( @@ -2875,9 +2871,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen) "Bq" = ( -/obj/structure/chair/sofa/right{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/right/directional/north, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -2891,9 +2885,7 @@ /obj/effect/turf_decal/siding/wood/end{ dir = 8 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/item/toy/plush/snakeplushie, /turf/open/floor/carpet/red, /area/ship/crew/office) @@ -3093,9 +3085,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "Ee" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, +/obj/structure/chair/sofa/brown/directional/north, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "EJ" = ( @@ -3119,9 +3109,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "Fh" = ( @@ -4032,9 +4020,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/machinery/light/directional/south, /turf/open/floor/carpet/red, /area/ship/crew/office) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index d02d2a60319c..41faf816d827 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1250,9 +1250,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ dir = 8 }, @@ -1714,9 +1712,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ dir = 4 @@ -1867,7 +1863,7 @@ /turf/open/floor/plating, /area/ship/crew/office) "Vw" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/machinery/light/small/directional/north, /obj/structure/sign/poster/contraband/red_rum{ pixel_y = 32 @@ -1875,7 +1871,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "VJ" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, /obj/structure/closet/wall/directional/north, /turf/open/floor/plasteel/dark, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index cce460292a0c..f573148a8fe4 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -1059,7 +1059,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/brown/left/directional/south, /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/red, /area/ship/crew) @@ -1942,9 +1942,7 @@ /turf/open/floor/carpet/red, /area/ship/crew/dorm) "Gj" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable{ icon_state = "0-4" @@ -2797,9 +2795,7 @@ /area/ship/hallway/central) "Tq" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/right{ - dir = 4 - }, +/obj/structure/chair/sofa/brown/right/directional/east, /obj/effect/landmark/start/assistant, /obj/structure/extinguisher_cabinet/directional/north, /obj/structure/extinguisher_cabinet/directional/west, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index a4f74d6a6737..b0a7e7fc2856 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -1776,9 +1776,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) "qZ" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/comfy/grey/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/directional/west, /turf/open/floor/carpet/red_gold, diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 19071dbc1baf..5878f667db1e 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -4185,9 +4185,7 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "yM" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "yN" = ( diff --git a/_maps/templates/shelter_1.dmm b/_maps/templates/shelter_1.dmm index f5b2e141f4c4..434e000defc8 100644 --- a/_maps/templates/shelter_1.dmm +++ b/_maps/templates/shelter_1.dmm @@ -50,9 +50,7 @@ /area/survivalpod) "l" = ( /obj/structure/tubes, -/obj/structure/chair/comfy/black{ - dir = 8 - }, +/obj/structure/chair/comfy/grey/directional/west, /turf/open/floor/pod, /area/survivalpod) "m" = ( diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index 4a6de9bbf07d..9c2571e6f5a5 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -72,7 +72,7 @@ /turf/open/floor/carpet/black, /area/survivalpod) "o" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /obj/item/cardboard_cutout{ desc = "A cardboard cutout of a xenomorph maid."; icon_state = "cutout_lusty"; @@ -179,9 +179,7 @@ /turf/open/floor/carpet/black, /area/survivalpod) "B" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/carpet/black, /area/survivalpod) "C" = ( diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index 402c5f04923c..dd4f6645a518 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -178,7 +178,7 @@ /turf/open/floor/pod/dark, /area/survivalpod) "D" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/grey/directional/south, /turf/open/floor/carpet/black, /area/survivalpod) "E" = ( @@ -221,9 +221,7 @@ /turf/closed/wall/mineral/titanium/survival/nodiagonal, /area/survivalpod) "K" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, +/obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/carpet/black, /area/survivalpod) "L" = (