From f0ae5d97ca08f3921f755f2740380382014238e4 Mon Sep 17 00:00:00 2001
From: thgvr <81882910+thgvr@users.noreply.github.com>
Date: Thu, 18 Apr 2024 20:12:07 -0700
Subject: [PATCH] Spooky sprites take2 (#2915)
## About The Pull Request
https://github.com/shiptest-ss13/Shiptest/pull/2908
## Changelog
:cl: Spookypineapple, Imaginos, Thgvr
add: New sofa and comfy chair variants, both are craftable with metal
imageadd: Sofas, Comfy chairs, and some atmos equipment have a new coat
of paint
imageadd: Janitorial equipment has a new coat of paint
/:cl:
---
.../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 +-
.../lavaland_surface_dwarffortress.dmm | 4 +-
.../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 | 20 +-
_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 +-
code/game/machinery/rechargestation.dm | 2 +-
code/game/objects/items/miscellaneous.dm | 4 +-
.../stacks/sheets/recipes/recipes_metal.dm | 250 ++++++++++
.../items/stacks/sheets/sheet_types.dm | 113 +----
.../objects/structures/beds_chairs/bed.dm | 5 -
.../objects/structures/beds_chairs/chair.dm | 103 -----
.../objects/structures/beds_chairs/comfy.dm | 270 +++++++++++
.../objects/structures/beds_chairs/pew.dm | 6 +-
.../objects/structures/beds_chairs/sofa.dm | 430 +++++++++++++++++-
code/modules/clothing/suits/miscellaneous.dm | 3 +-
.../reagents/reagent_containers/pill.dm | 2 +-
.../reagents/reagent_containers/spray.dm | 14 +-
icons/obj/atmos.dmi | Bin 11891 -> 11720 bytes
icons/obj/chairs.dmi | Bin 29542 -> 28882 bytes
icons/obj/janitor.dmi | Bin 27106 -> 24520 bytes
icons/obj/machines/borgcharger.dmi | Bin 0 -> 1722 bytes
icons/obj/objects.dmi | Bin 115979 -> 102051 bytes
icons/obj/structures/chairs/comfychair.dmi | Bin 0 -> 23665 bytes
icons/obj/structures/chairs/sofa.dmi | Bin 0 -> 92079 bytes
shiptest.dme | 2 +
.../Scripts/2908_sofas_and_chairs.txt | 49 ++
97 files changed, 1432 insertions(+), 1311 deletions(-)
create mode 100644 code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
create mode 100644 code/game/objects/structures/beds_chairs/comfy.dm
create mode 100644 icons/obj/machines/borgcharger.dmi
create mode 100644 icons/obj/structures/chairs/comfychair.dmi
create mode 100644 icons/obj/structures/chairs/sofa.dmi
create mode 100644 tools/UpdatePaths/Scripts/2908_sofas_and_chairs.txt
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 a309798f02fe..dee3343b8d78 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 547647fab052..057b0cbdbe8f 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/LavaRuins/lavaland_surface_dwarffortress.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
index 52a302920d24..cc86f39dfc82 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
@@ -233,9 +233,7 @@
/turf/open/floor/plating/asteroid/basalt,
/area/overmap_encounter/planetoid/cave/explored)
"Oy" = (
-/obj/structure/chair/comfy/lime{
- dir = 8
- },
+/obj/structure/chair/comfy/orange/directional/south,
/turf/open/floor/plating/asteroid/basalt,
/area/overmap_encounter/planetoid/cave/explored)
"Pl" = (
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..73735c65542b 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
},
@@ -1727,9 +1725,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"pE" = (
-/obj/structure/chair/comfy/lime{
- dir = 8
- },
+/obj/structure/chair/comfy/orange/directional/south,
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust,
@@ -2038,9 +2034,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 +2093,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 +3805,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 02bd8e6f14f8..118f810e93f8 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 e66283a78671..b98d0f2f13cd 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 b0c66424a2d4..d4ae92298e58 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 64d506147d56..cb37458146fc 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 21331c0bf281..25c1da558e56 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)
@@ -3723,7 +3719,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,
@@ -4393,9 +4389,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" = (
@@ -4539,9 +4533,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" = (
@@ -4768,7 +4760,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,
@@ -5134,7 +5126,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,
@@ -5873,7 +5865,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" = (
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 7039b015e673..14e253298070 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -1,7 +1,7 @@
/obj/machinery/recharge_station
name = "cyborg recharging station"
desc = "This device recharges cyborgs and resupplies them with materials."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/borgcharger.dmi'
icon_state = "borgcharger0"
density = FALSE
use_power = IDLE_POWER_USE
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 487d5d2c96ca..0f5d79f13b37 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -1,8 +1,8 @@
/obj/item/caution
- desc = "Caution! Wet Floor!"
name = "wet floor sign"
- icon = 'icons/obj/janitor.dmi'
+ desc = "No running."
icon_state = "caution"
+ icon = 'icons/obj/janitor.dmi'
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
force = 1
diff --git a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
new file mode 100644
index 000000000000..6860f34be5c7
--- /dev/null
+++ b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
@@ -0,0 +1,250 @@
+GLOBAL_LIST_INIT(metal_recipes, list ( \
+ new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("double bed", /obj/structure/bed/double, 4, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe_list("office chairs", list( \
+ new/datum/stack_recipe("gray office chair", /obj/structure/chair/office, 5, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("dark office chair", /obj/structure/chair/office/dark, 5, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("purple office chair", /obj/structure/chair/office/purple, 5, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("bench chairs", list( \
+ new/datum/stack_recipe("purple bench chair", /obj/structure/chair/bench/purple, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("beige bench chair", /obj/structure/chair/bench/beige, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("grey bench chair", /obj/structure/chair/bench/grey, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("blue bench chair", /obj/structure/chair/bench/blue, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("red bench chair", /obj/structure/chair/bench/red, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("olive bench chair", /obj/structure/chair/bench/olive, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("comfy chairs", list( \
+ new/datum/stack_recipe("purple comfy chair", /obj/structure/chair/comfy/purple, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("beige comfy chair", /obj/structure/chair/comfy/beige, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("grey comfy chair", /obj/structure/chair/comfy/grey, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("orange comfy chair", /obj/structure/chair/comfy/orange, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("blue comfy chair", /obj/structure/chair/comfy/blue, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("red comfy chair", /obj/structure/chair/comfy/red, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("olive comfy chair", /obj/structure/chair/comfy/olive, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("comfy chairs (old)", list( \
+ new/datum/stack_recipe("old purple comfy chair", /obj/structure/chair/comfy/purple/old, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old beige comfy chair", /obj/structure/chair/comfy/beige/old, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old grey comfy chair", /obj/structure/chair/comfy/grey/old, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old orange comfy chair", /obj/structure/chair/comfy/orange/old, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old blue comfy chair", /obj/structure/chair/comfy/blue/old, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old red comfy chair", /obj/structure/chair/comfy/red/old, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old olive comfy chair", /obj/structure/chair/comfy/olive/old, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("comfy chairs (old - alt)", list( \
+ new/datum/stack_recipe("old purple comfy chair (alt)", /obj/structure/chair/comfy/purple/old/alt, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old beige comfy chair (alt)", /obj/structure/chair/comfy/beige/old/alt, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old grey comfy chair (alt)", /obj/structure/chair/comfy/grey/old/alt, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old orange comfy chair (alt)", /obj/structure/chair/comfy/orange/old/alt, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old blue comfy chair (alt)", /obj/structure/chair/comfy/blue/old/alt, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old red comfy chair (alt)", /obj/structure/chair/comfy/red/old/alt, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old olive comfy chair (alt)", /obj/structure/chair/comfy/olive/old/alt, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("comfy chairs (corpo)", list( \
+ new/datum/stack_recipe("purple corpo chair", /obj/structure/chair/comfy/purple/corpo, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("beige corpo chair", /obj/structure/chair/comfy/beige/corpo, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("grey corpo chair", /obj/structure/chair/comfy/grey/corpo, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("orange corpo chair", /obj/structure/chair/comfy/orange/corpo, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("blue corpo chair", /obj/structure/chair/comfy/blue/corpo, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("red corpo chair", /obj/structure/chair/comfy/red/corpo, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("olive corpo chair", /obj/structure/chair/comfy/olive/corpo, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("sofas", list( \
+ // New brown Sofa
+ new/datum/stack_recipe("brown sofa (middle)", /obj/structure/chair/sofa/brown, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("brown sofa (left)", /obj/structure/chair/sofa/brown/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("brown sofa (right)", /obj/structure/chair/sofa/brown/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("brown sofa (corner)", /obj/structure/chair/sofa/brown/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("brown sofa (internal corner)", /obj/structure/chair/sofa/brown/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // New purple sofa
+ new/datum/stack_recipe("purple sofa (middle)", /obj/structure/chair/sofa/purple, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("purple sofa (left)", /obj/structure/chair/sofa/purple/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("purple sofa (right)", /obj/structure/chair/sofa/purple/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("purple sofa (corner)", /obj/structure/chair/sofa/purple/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("purple sofa (internal corner)", /obj/structure/chair/sofa/purple/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // New blue Sofa
+ new/datum/stack_recipe("blue sofa (middle)", /obj/structure/chair/sofa/blue, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("blue sofa (left)", /obj/structure/chair/sofa/blue/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("blue sofa (right)", /obj/structure/chair/sofa/blue/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("blue sofa (corner)", /obj/structure/chair/sofa/blue/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("blue sofa (internal corner)", /obj/structure/chair/sofa/blue/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // New red Sofa
+ new/datum/stack_recipe("red sofa (middle)", /obj/structure/chair/sofa/red, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("red sofa (left)", /obj/structure/chair/sofa/red/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("red sofa (right)", /obj/structure/chair/sofa/red/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("red sofa (corner)", /obj/structure/chair/sofa/red/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("red sofa (internal corner)", /obj/structure/chair/sofa/red/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // New grey Sofa
+ new/datum/stack_recipe("grey sofa (middle)", /obj/structure/chair/sofa/grey, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("grey sofa (left)", /obj/structure/chair/sofa/grey/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("grey sofa (right)", /obj/structure/chair/sofa/grey/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("grey sofa (corner)", /obj/structure/chair/sofa/grey/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("grey sofa (internal corner)", /obj/structure/chair/sofa/grey/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // New olive Sofa
+ new/datum/stack_recipe("olive sofa (middle)", /obj/structure/chair/sofa/olive, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("olive sofa (left)", /obj/structure/chair/sofa/olive/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("olive sofa (right)", /obj/structure/chair/sofa/olive/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("olive sofa (corner)", /obj/structure/chair/sofa/olive/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("olive sofa (internal corner)", /obj/structure/chair/sofa/olive/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("sofas (old)", list(
+ // Old brown Sofa
+ new/datum/stack_recipe("old brown sofa (middle)", /obj/structure/chair/sofa/brown/old, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old brown sofa (left)", /obj/structure/chair/sofa/brown/old/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old brown sofa (right)", /obj/structure/chair/sofa/brown/old/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old brown sofa (corner)", /obj/structure/chair/sofa/brown/old/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old brown sofa (internal corner)", /obj/structure/chair/sofa/brown/old/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Old purple Sofa
+ new/datum/stack_recipe("old purple sofa (middle)", /obj/structure/chair/sofa/purple/old, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old purple sofa (left)", /obj/structure/chair/sofa/purple/old/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old purple sofa (right)", /obj/structure/chair/sofa/purple/old/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old purple sofa (corner)", /obj/structure/chair/sofa/purple/old/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old purple sofa (internal corner)", /obj/structure/chair/sofa/purple/old/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Old blue Sofa
+ new/datum/stack_recipe("old blue sofa (middle)", /obj/structure/chair/sofa/blue/old, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old blue sofa (left)", /obj/structure/chair/sofa/blue/old/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old blue sofa (right)", /obj/structure/chair/sofa/blue/old/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old blue sofa (corner)", /obj/structure/chair/sofa/blue/old/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old blue sofa (internal corner)", /obj/structure/chair/sofa/blue/old/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Old red Sofa
+ new/datum/stack_recipe("old red sofa (middle)", /obj/structure/chair/sofa/red/old, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old red sofa (left)", /obj/structure/chair/sofa/red/old/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old red sofa (right)", /obj/structure/chair/sofa/red/old/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old red sofa (corner)", /obj/structure/chair/sofa/red/old/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old red sofa (internal corner)", /obj/structure/chair/sofa/red/old/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Old grey Sofa
+ new/datum/stack_recipe("old grey sofa (middle)", /obj/structure/chair/sofa/grey/old, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old grey sofa (left)", /obj/structure/chair/sofa/grey/old/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old grey sofa (right)", /obj/structure/chair/sofa/grey/old/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old grey sofa (corner)", /obj/structure/chair/sofa/grey/old/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old grey sofa (internal corner)", /obj/structure/chair/sofa/grey/old/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Old olive Sofa
+ new/datum/stack_recipe("old olive sofa (middle)", /obj/structure/chair/sofa/olive/old, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old olive sofa (left)", /obj/structure/chair/sofa/olive/old/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old olive sofa (right)", /obj/structure/chair/sofa/olive/old/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old olive sofa (corner)", /obj/structure/chair/sofa/olive/old/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("old olive sofa (internal corner)", /obj/structure/chair/sofa/olive/old/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe_list("sofas (corpo)", list(
+ // Corpo brown Sofa
+ new/datum/stack_recipe("corpo brown sofa (middle)", /obj/structure/chair/sofa/brown/corpo, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo brown sofa (left)", /obj/structure/chair/sofa/brown/corpo/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo brown sofa (right)", /obj/structure/chair/sofa/brown/corpo/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo brown sofa (corner)", /obj/structure/chair/sofa/brown/corpo/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo brown sofa (internal corner)", /obj/structure/chair/sofa/brown/corpo/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Corpo purple Sofa
+ new/datum/stack_recipe("corpo purple sofa (middle)", /obj/structure/chair/sofa/purple/corpo, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo purple sofa (left)", /obj/structure/chair/sofa/purple/corpo/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo purple sofa (right)", /obj/structure/chair/sofa/purple/corpo/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo purple sofa (corner)", /obj/structure/chair/sofa/purple/corpo/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo purple sofa (internal corner)", /obj/structure/chair/sofa/purple/corpo/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Corpo blue Sofa
+ new/datum/stack_recipe("corpo blue sofa (middle)", /obj/structure/chair/sofa/blue/corpo, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo blue sofa (left)", /obj/structure/chair/sofa/blue/corpo/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo blue sofa (right)", /obj/structure/chair/sofa/blue/corpo/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo blue sofa (corner)", /obj/structure/chair/sofa/blue/corpo/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo blue sofa (internal corner)", /obj/structure/chair/sofa/blue/corpo/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Corpo red Sofa
+ new/datum/stack_recipe("corpo red sofa (middle)", /obj/structure/chair/sofa/red/corpo, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo red sofa (left)", /obj/structure/chair/sofa/red/corpo/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo red sofa (right)", /obj/structure/chair/sofa/red/corpo/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo red sofa (corner)", /obj/structure/chair/sofa/red/corpo/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo red sofa (internal corner)", /obj/structure/chair/sofa/red/corpo/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Corpo grey Sofa
+ new/datum/stack_recipe("corpo grey sofa (middle)", /obj/structure/chair/sofa/grey/corpo, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo grey sofa (left)", /obj/structure/chair/sofa/grey/corpo/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo grey sofa (right)", /obj/structure/chair/sofa/grey/corpo/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo grey sofa (corner)", /obj/structure/chair/sofa/grey/corpo/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo grey sofa (internal corner)", /obj/structure/chair/sofa/grey/corpo/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ // Corpo olive Sofa
+ new/datum/stack_recipe("corpo olive sofa (middle)", /obj/structure/chair/sofa/olive/corpo, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo olive sofa (left)", /obj/structure/chair/sofa/olive/corpo/left, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo olive sofa (right)", /obj/structure/chair/sofa/olive/corpo/right, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo olive sofa (corner)", /obj/structure/chair/sofa/olive/corpo/corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("corpo olive sofa (internal corner)", /obj/structure/chair/sofa/olive/corpo/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ null, \
+ new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
+ new/datum/stack_recipe("crate shelf parts", /obj/item/rack_parts/shelf), \
+ new/datum/stack_recipe_list("closets", list(
+ new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("emergency closet", /obj/structure/closet/emcloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("fire-safety closet", /obj/structure/closet/firecloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("tool closet", /obj/structure/closet/toolcloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("radiation closet", /obj/structure/closet/radiation/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE)
+ )),
+ null, \
+ new/datum/stack_recipe_list("crates", list(
+ new/datum/stack_recipe("crate", /obj/structure/closet/crate, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("internals crate", /obj/structure/closet/crate/internals, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("engineering crate", /obj/structure/closet/crate/engineering, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("medical crate", /obj/structure/closet/crate/medical, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("science crate", /obj/structure/closet/crate/science, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
+ new/datum/stack_recipe("hydroponics crate", /obj/structure/closet/crate/hydroponics, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE)
+ )),
+ null, \
+ new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("plasteel floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
+ new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
+ null, \
+ new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
+ null, \
+ new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe_list("airlock assemblies", list( \
+ new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("public airlock assembly", /obj/structure/door_assembly/door_assembly_public, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("virology airlock assembly", /obj/structure/door_assembly/door_assembly_viro, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("external maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_extmai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+ )), \
+ null, \
+ new/datum/stack_recipe("firelock frame (fulltile)", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("firelock frame (directional)", /obj/structure/firelock_frame/border, 1, time = 25, on_floor = TRUE), \
+ new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade), \
+ new/datum/stack_recipe("light fixture frame", /obj/item/wallframe/light_fixture, 2), \
+ new/datum/stack_recipe("small light fixture frame", /obj/item/wallframe/light_fixture/small, 1), \
+ null, \
+ new/datum/stack_recipe("apc frame", /obj/item/wallframe/apc, 2), \
+ new/datum/stack_recipe("air alarm frame", /obj/item/wallframe/airalarm, 2), \
+ new/datum/stack_recipe("airlock controller frame", /obj/item/wallframe/advanced_airlock_controller, 2), \
+ new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2), \
+ new/datum/stack_recipe("extinguisher cabinet frame", /obj/item/wallframe/extinguisher_cabinet, 2), \
+ new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1), \
+ null, \
+ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \
+ new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/metal, 3), \
+ new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \
+ new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 50), \
+ new/datum/stack_recipe_list("weight machines", list( \
+ new/datum/stack_recipe("chest press", /obj/structure/weightmachine/stacklifter, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("bench press", /obj/structure/weightmachine/weightlifter, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
+ new/datum/stack_recipe("shower", /obj/machinery/shower, 3, time = 25)
+))
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index cf4824f20fbe..a80ca9008401 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -14,116 +14,6 @@
/*
* Metal
*/
-GLOBAL_LIST_INIT(metal_recipes, list ( \
- new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("double bed", /obj/structure/bed/double, 4, one_per_turf = TRUE, on_floor = TRUE), \
- null, \
- new/datum/stack_recipe_list("office chairs", list( \
- new/datum/stack_recipe("gray office chair", /obj/structure/chair/office, 5, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("dark office chair", /obj/structure/chair/office/dark, 5, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("purple office chair", /obj/structure/chair/office/purple, 5, one_per_turf = TRUE, on_floor = TRUE), \
- )), \
- new/datum/stack_recipe_list("comfy chairs", list( \
- new/datum/stack_recipe("beige comfy chair", /obj/structure/chair/comfy/beige, 2, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("black comfy chair", /obj/structure/chair/comfy/black, 2, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("brown comfy chair", /obj/structure/chair/comfy/brown, 2, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("lime comfy chair", /obj/structure/chair/comfy/lime, 2, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, one_per_turf = TRUE, on_floor = TRUE), \
- )), \
- new/datum/stack_recipe_list("sofas", list(
- new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("red sofa (middle)", /obj/structure/chair/sofa/red, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("red sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("red sofa (right)", /obj/structure/chair/sofa/red/right, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("red sofa (corner)", /obj/structure/chair/sofa/red/corner, 1, one_per_turf = TRUE, on_floor = TRUE),
- new /datum/stack_recipe("red sofa (internal corner)", /obj/structure/chair/sofa/red/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE)
- )),
- null, \
- new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
- new/datum/stack_recipe("crate shelf parts", /obj/item/rack_parts/shelf), \
- new/datum/stack_recipe_list("closets", list(
- new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("emergency closet", /obj/structure/closet/emcloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("fire-safety closet", /obj/structure/closet/firecloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("tool closet", /obj/structure/closet/toolcloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("radiation closet", /obj/structure/closet/radiation/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE)
- )),
- null, \
- new/datum/stack_recipe_list("crates", list(
- new/datum/stack_recipe("crate", /obj/structure/closet/crate, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("internals crate", /obj/structure/closet/crate/internals, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("engineering crate", /obj/structure/closet/crate/engineering, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("medical crate", /obj/structure/closet/crate/medical, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("science crate", /obj/structure/closet/crate/science, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE),
- new/datum/stack_recipe("hydroponics crate", /obj/structure/closet/crate/hydroponics, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE)
- )),
- null, \
- new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
- null, \
- new/datum/stack_recipe("plasteel floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
- new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
- null, \
- new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
- null, \
- new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- null, \
- new /datum/stack_recipe_list("airlock assemblies", list( \
- new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("public airlock assembly", /obj/structure/door_assembly/door_assembly_public, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("virology airlock assembly", /obj/structure/door_assembly/door_assembly_viro, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("external maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_extmai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- new /datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
- )), \
- null, \
- new/datum/stack_recipe("firelock frame (fulltile)", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("firelock frame (directional)", /obj/structure/firelock_frame/border, 1, time = 25, on_floor = TRUE), \
- new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- null, \
- new/datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade), \
- new/datum/stack_recipe("light fixture frame", /obj/item/wallframe/light_fixture, 2), \
- new/datum/stack_recipe("small light fixture frame", /obj/item/wallframe/light_fixture/small, 1), \
- null, \
- new/datum/stack_recipe("apc frame", /obj/item/wallframe/apc, 2), \
- new/datum/stack_recipe("air alarm frame", /obj/item/wallframe/airalarm, 2), \
- new/datum/stack_recipe("airlock controller frame", /obj/item/wallframe/advanced_airlock_controller, 2), \
- new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2), \
- new/datum/stack_recipe("extinguisher cabinet frame", /obj/item/wallframe/extinguisher_cabinet, 2), \
- new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1), \
- null, \
- new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \
- new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/metal, 3), \
- new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \
- new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 50), \
- new/datum/stack_recipe_list("weight machines", list( \
- new/datum/stack_recipe("chest press", /obj/structure/weightmachine/stacklifter, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("bench press", /obj/structure/weightmachine/weightlifter, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
- )), \
- new/datum/stack_recipe("shower", /obj/machinery/shower, 3, time = 25)
-))
/obj/item/stack/sheet/metal
name = "metal"
@@ -169,7 +59,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
/*
* Plasteel
*/
-// WS Begin: carpet
+
GLOBAL_LIST_INIT(plasteel_recipes, list ( \
new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = TRUE), \
new/datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 10, time = 50), \
@@ -189,7 +79,6 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
new/datum/stack_recipe("shutters frame", /obj/structure/poddoor_assembly/shutters, 5, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blast door frame", /obj/structure/poddoor_assembly, 15, time = 50, one_per_turf = 1, on_floor = 1)
))
-// WS End: carpet
/obj/item/stack/sheet/plasteel
name = "plasteel"
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 3c7d1ac0f01c..d81e8b8ba456 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -210,11 +210,6 @@
. = ..()
update_owner(M)
-/obj/structure/bed/alien
- name = "resting contraption"
- desc = "This looks similar to contraptions from Earth. Could aliens be stealing our technology?"
- icon_state = "abed"
-
//Double Beds, for luxurious sleeping, i.e. the captain and maybe heads - no quirky refrence here. Move along
/obj/structure/bed/double
name = "double bed"
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index a8d560796f7e..76b3fb7a5989 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -134,67 +134,6 @@
icon_state = "wooden_chair_wings"
item_chair = /obj/item/chair/wood/wings
-/obj/structure/chair/comfy
- name = "comfy chair"
- desc = "It looks comfy."
- icon_state = "comfychair"
- color = rgb(255,255,255)
- resistance_flags = FLAMMABLE
- max_integrity = 70
- buildstackamount = 2
- item_chair = null
- var/mutable_appearance/armrest
-
-/obj/structure/chair/comfy/Initialize()
- armrest = GetArmrest()
- armrest.layer = ABOVE_MOB_LAYER
- return ..()
-
-/obj/structure/chair/comfy/proc/GetArmrest()
- return mutable_appearance(icon, "[icon_state]_armrest")
-
-/obj/structure/chair/comfy/Destroy()
- QDEL_NULL(armrest)
- return ..()
-
-/obj/structure/chair/comfy/post_buckle_mob(mob/living/M)
- . = ..()
- update_armrest()
-
-/obj/structure/chair/comfy/proc/update_armrest()
- if(has_buckled_mobs())
- add_overlay(armrest)
- else
- cut_overlay(armrest)
-
-/obj/structure/chair/comfy/post_unbuckle_mob()
- . = ..()
- update_armrest()
-
-/obj/structure/chair/comfy/brown
- color = rgb(255,113,0)
-
-/obj/structure/chair/comfy/beige
- color = rgb(255,253,195)
-
-/obj/structure/chair/comfy/teal
- color = rgb(0,255,255)
-
-/obj/structure/chair/comfy/black
- color = rgb(167,164,153)
-
-/obj/structure/chair/comfy/lime
- color = rgb(255,251,0)
-
-/obj/structure/chair/comfy/shuttle
- name = "shuttle seat"
- desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
- icon_state = "shuttle_chair"
- buildstacktype = /obj/item/stack/sheet/mineral/titanium
-
-/obj/structure/chair/comfy/shuttle/GetArmrest()
- return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
-
/obj/structure/chair/office
anchored = FALSE
buildstackamount = 5
@@ -367,48 +306,6 @@
icon_state = "wooden_chair_wings_toppled"
origin_type = /obj/structure/chair/wood/wings
-/obj/structure/chair/comfy/shuttle/bronze
- name = "brass chair"
- desc = "A spinny chair made of bronze. It has little cogs for wheels!"
- anchored = FALSE
- icon_state = "brass_chair"
- buildstacktype = /obj/item/stack/tile/bronze
- buildstackamount = 1
- item_chair = null
- var/turns = 0
-
-/obj/structure/chair/comfy/shuttle/bronze/GetArmrest()
- return mutable_appearance('icons/obj/chairs.dmi', "brass_chair_armrest")
-
-/obj/structure/chair/comfy/shuttle/bronze/Destroy()
- STOP_PROCESSING(SSfastprocess, src)
- . = ..()
-
-/obj/structure/chair/comfy/shuttle/bronze/process()
- setDir(turn(dir,-90))
- playsound(src, 'sound/effects/servostep.ogg', 50, FALSE)
- turns++
- if(turns >= 8)
- STOP_PROCESSING(SSfastprocess, src)
-
-/obj/structure/chair/comfy/shuttle/bronze/Moved()
- . = ..()
- if(has_gravity())
- playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
-
-/obj/structure/chair/comfy/shuttle/bronze/AltClick(mob/living/user)
- turns = 0
- if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
- return
- if(!(datum_flags & DF_ISPROCESSING))
- user.visible_message("[user] spins [src] around, and the last vestiges of Ratvarian technology keeps it spinning FOREVER.", \
- "Automated spinny chairs. The pinnacle of ancient Ratvarian technology.")
- START_PROCESSING(SSfastprocess, src)
- else
- user.visible_message("[user] stops [src]'s uncontrollable spinning.", \
- "You grab [src] and stop its wild spinning.")
- STOP_PROCESSING(SSfastprocess, src)
-
/obj/structure/chair/mime
name = "invisible chair"
desc = "The mime needs to sit down and shut up."
diff --git a/code/game/objects/structures/beds_chairs/comfy.dm b/code/game/objects/structures/beds_chairs/comfy.dm
new file mode 100644
index 000000000000..b3d7f38e9a90
--- /dev/null
+++ b/code/game/objects/structures/beds_chairs/comfy.dm
@@ -0,0 +1,270 @@
+// Base type - DO NOT USE!
+/obj/structure/chair/comfy
+ name = "comfy chair"
+ desc = "It looks comfy."
+ icon_state = null
+ icon = 'icons/obj/structures/chairs/comfychair.dmi'
+ resistance_flags = FLAMMABLE
+ max_integrity = 70
+ buildstackamount = 2
+ item_chair = null
+
+ ///Armrest sprite to overlay over mobs
+ var/mutable_appearance/armrest
+
+/obj/structure/chair/comfy/Initialize()
+ armrest = get_armrest()
+ armrest.layer = ABOVE_MOB_LAYER
+ return ..()
+
+/obj/structure/chair/comfy/proc/get_armrest()
+ return mutable_appearance(icon, "overlay_[icon_state]")
+
+/obj/structure/chair/comfy/Destroy()
+ QDEL_NULL(armrest)
+ return ..()
+
+/obj/structure/chair/comfy/post_buckle_mob(mob/living/M)
+ . = ..()
+ update_armrest()
+
+/obj/structure/chair/comfy/proc/update_armrest()
+ if(has_buckled_mobs())
+ add_overlay(armrest)
+ else
+ cut_overlay(armrest)
+
+/obj/structure/chair/comfy/post_unbuckle_mob()
+ . = ..()
+ update_armrest()
+
+// Update this along with brass chair
+/obj/structure/chair/comfy/shuttle
+ name = "shuttle seat"
+ desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
+ icon_state = "shuttle_chair"
+ icon = 'icons/obj/chairs.dmi'
+ buildstacktype = /obj/item/stack/sheet/mineral/titanium
+
+/obj/structure/chair/comfy/shuttle/get_armrest()
+ return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
+
+/obj/structure/chair/comfy/shuttle/bronze
+ name = "brass chair"
+ desc = "A spinny chair made of bronze. It has little cogs for wheels!"
+ anchored = FALSE
+ icon_state = "brass_chair"
+ buildstacktype = /obj/item/stack/tile/bronze
+ buildstackamount = 1
+ item_chair = null
+ var/turns = 0
+
+/obj/structure/chair/comfy/shuttle/bronze/get_armrest()
+ return mutable_appearance('icons/obj/chairs.dmi', "brass_chair_armrest")
+
+/obj/structure/chair/comfy/shuttle/bronze/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ . = ..()
+
+/obj/structure/chair/comfy/shuttle/bronze/process()
+ setDir(turn(dir,-90))
+ playsound(src, 'sound/effects/servostep.ogg', 50, FALSE)
+ turns++
+ if(turns >= 8)
+ STOP_PROCESSING(SSfastprocess, src)
+
+/obj/structure/chair/comfy/shuttle/bronze/Moved()
+ . = ..()
+ if(has_gravity())
+ playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
+
+/obj/structure/chair/comfy/shuttle/bronze/AltClick(mob/living/user)
+ turns = 0
+ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+ return
+ if(!(datum_flags & DF_ISPROCESSING))
+ user.visible_message("[user] spins [src] around, and the last vestiges of Ratvarian technology keeps it spinning FOREVER.", \
+ "Automated spinny chairs. The pinnacle of ancient Ratvarian technology.")
+ START_PROCESSING(SSfastprocess, src)
+ else
+ user.visible_message("[user] stops [src]'s uncontrollable spinning.", \
+ "You grab [src] and stop its wild spinning.")
+ STOP_PROCESSING(SSfastprocess, src)
+
+// Purple
+/obj/structure/chair/comfy/purple
+ icon_state = "imaginos_purple"
+
+/obj/structure/chair/comfy/purple/old
+ icon_state = "old_purple"
+
+/obj/structure/chair/comfy/purple/old/alt
+ icon_state = "old_purple_alt"
+
+/obj/structure/chair/comfy/purple/corpo
+ icon_state = "corp_purple"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/purple, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/purple/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/purple/old/alt, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/purple/corpo, 0)
+
+// Beige
+/obj/structure/chair/comfy/beige
+ icon_state = "imaginos_beige"
+
+/obj/structure/chair/comfy/beige/old
+ icon_state = "old_beige"
+
+/obj/structure/chair/comfy/beige/old/alt
+ icon_state = "old_beige_alt"
+
+/obj/structure/chair/comfy/beige/corpo
+ icon_state = "corp_beige"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/beige, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/beige/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/beige/old/alt, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/beige/corpo, 0)
+
+// Grey
+/obj/structure/chair/comfy/grey
+ icon_state = "imaginos_grey"
+
+/obj/structure/chair/comfy/grey/old
+ icon_state = "old_grey"
+
+/obj/structure/chair/comfy/grey/old/alt
+ icon_state = "old_grey_alt"
+
+/obj/structure/chair/comfy/grey/corpo
+ icon_state = "corp_grey"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/grey, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/grey/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/grey/old/alt, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/grey/corpo, 0)
+
+// Orange
+
+/obj/structure/chair/comfy/orange
+ icon_state = "imaginos_orange"
+
+/obj/structure/chair/comfy/orange/old
+ icon_state = "old_orange"
+
+/obj/structure/chair/comfy/orange/old/alt
+ icon_state = "old_orange_alt"
+
+/obj/structure/chair/comfy/orange/corpo
+ icon_state = "corp_orange"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/orange, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/orange/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/orange/old/alt, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/orange/corpo, 0)
+
+// Blue
+
+/obj/structure/chair/comfy/blue
+ icon_state = "imaginos_blue"
+
+/obj/structure/chair/comfy/blue/old
+ icon_state = "old_blue"
+
+/obj/structure/chair/comfy/blue/old/alt
+ icon_state = "old_blue_alt"
+
+/obj/structure/chair/comfy/blue/corpo
+ icon_state = "corp_blue"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/blue, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/blue/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/blue/old/alt, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/blue/corpo, 0)
+
+// Red
+
+/obj/structure/chair/comfy/red
+ icon_state = "imaginos_red"
+
+/obj/structure/chair/comfy/red/old
+ icon_state = "old_red"
+
+/obj/structure/chair/comfy/red/old/alt
+ icon_state = "old_red_alt"
+
+/obj/structure/chair/comfy/red/corpo
+ icon_state = "corp_red"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/red, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/red/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/red/old/alt, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/red/corpo, 0)
+
+// Olive
+
+/obj/structure/chair/comfy/olive
+ icon_state = "imaginos_olive"
+
+/obj/structure/chair/comfy/olive/old
+ icon_state = "old_olive"
+
+/obj/structure/chair/comfy/olive/old/alt
+ icon_state = "old_olive_alt"
+
+/obj/structure/chair/comfy/olive/corpo
+ icon_state = "corp_olive"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/olive, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/olive/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/olive/old/alt, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/comfy/olive/corpo, 0)
+
+// Benches - No armrests
+
+// Base type - DO NOT USE!
+/obj/structure/chair/bench
+ name = "comfy bench"
+ desc = "It looks comfy."
+ icon_state = null
+ icon = 'icons/obj/structures/chairs/comfychair.dmi'
+ resistance_flags = FLAMMABLE
+ max_integrity = 70
+ buildstackamount = 2
+ item_chair = null
+
+/obj/structure/chair/bench/purple
+ icon_state = "bench_purple"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/bench/purple, 0)
+
+/obj/structure/chair/bench/beige
+ icon_state = "bench_beige"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/bench/beige, 0)
+
+/obj/structure/chair/bench/grey
+ icon_state = "bench_grey"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/bench/grey, 0)
+
+/obj/structure/chair/bench/orange
+ icon_state = "bench_orange"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/bench/orange, 0)
+
+/obj/structure/chair/bench/blue
+ icon_state = "bench_blue"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/bench/blue, 0)
+
+/obj/structure/chair/bench/red
+ icon_state = "bench_red"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/bench/red, 0)
+
+/obj/structure/chair/bench/olive
+ icon_state = "bench_olive"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/bench/olive, 0)
diff --git a/code/game/objects/structures/beds_chairs/pew.dm b/code/game/objects/structures/beds_chairs/pew.dm
index 8e5cf9a19493..87f02c41240e 100644
--- a/code/game/objects/structures/beds_chairs/pew.dm
+++ b/code/game/objects/structures/beds_chairs/pew.dm
@@ -1,7 +1,7 @@
/obj/structure/chair/pew
name = "wooden pew"
desc = "Kneel here and pray."
- icon = 'icons/obj/sofa.dmi'
+ icon = 'icons/obj/structures/chairs/sofa.dmi'
icon_state = "pewmiddle"
resistance_flags = FLAMMABLE
max_integrity = 70
@@ -22,7 +22,7 @@
return ..()
/obj/structure/chair/pew/left/proc/GetLeftPewArmrest()
- return mutable_appearance('icons/obj/sofa.dmi', "pewend_left_armrest")
+ return mutable_appearance('icons/obj/structures/chairs/sofa.dmi', "pewend_left_armrest")
/obj/structure/chair/pew/left/Destroy()
QDEL_NULL(leftpewarmrest)
@@ -53,7 +53,7 @@
return ..()
/obj/structure/chair/pew/right/proc/GetRightPewArmrest()
- return mutable_appearance('icons/obj/sofa.dmi', "pewend_right_armrest")
+ return mutable_appearance('icons/obj/structures/chairs/sofa.dmi', "pewend_right_armrest")
/obj/structure/chair/pew/right/Destroy()
QDEL_NULL(rightpewarmrest)
diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm
index 8ba787920546..0c69a2335f2c 100644
--- a/code/game/objects/structures/beds_chairs/sofa.dm
+++ b/code/game/objects/structures/beds_chairs/sofa.dm
@@ -1,31 +1,433 @@
+// Base type - DO NOT USE!
/obj/structure/chair/sofa
name = "sofa"
- icon_state = "sofamiddle"
- icon = 'icons/obj/sofa.dmi'
+ icon_state = null
+ icon = 'icons/obj/structures/chairs/sofa.dmi'
buildstackamount = 1
item_chair = null
-/obj/structure/chair/sofa/left
- icon_state = "sofaend_left"
+// brown, new
-/obj/structure/chair/sofa/right
- icon_state = "sofaend_right"
+/obj/structure/chair/sofa/brown
+ icon_state = "brown_sofa_middle"
-/obj/structure/chair/sofa/corner
- icon_state = "sofacorner"
+/obj/structure/chair/sofa/brown/left
+ icon_state = "brown_sofa_end_left"
+
+/obj/structure/chair/sofa/brown/right
+ icon_state = "brown_sofa_end_right"
+
+/obj/structure/chair/sofa/brown/corner
+ icon_state = "brown_sofa_corner"
+
+/obj/structure/chair/sofa/brown/internal_corner
+ icon_state = "brown_sofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/internal_corner, 0)
+
+// brown, old
+
+/obj/structure/chair/sofa/brown/old
+ name = "old ratty sofa"
+ icon_state = "brown_oldsofa_middle"
+
+/obj/structure/chair/sofa/brown/old/left
+ icon_state = "brown_oldsofa_end_left"
+
+/obj/structure/chair/sofa/brown/old/right
+ icon_state = "brown_oldsofa_end_right"
+
+/obj/structure/chair/sofa/brown/old/corner
+ icon_state = "brown_oldsofa_corner"
+
+/obj/structure/chair/sofa/brown/old/internal_corner
+ icon_state = "brown_oldsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/old/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/old/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/old/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/old/internal_corner, 0)
+
+// brown, corpo
+
+/obj/structure/chair/sofa/brown/corpo
+ name = "corporate sofa"
+ icon_state = "brown_corpsofa_middle"
+
+/obj/structure/chair/sofa/brown/corpo/left
+ icon_state = "brown_corpsofa_end_left"
+
+/obj/structure/chair/sofa/brown/corpo/right
+ icon_state = "brown_corpsofa_end_right"
+
+/obj/structure/chair/sofa/brown/corpo/corner
+ icon_state = "brown_corpsofa_corner"
+
+/obj/structure/chair/sofa/brown/corpo/internal_corner
+ icon_state = "brown_corpsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/corpo, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/corpo/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/corpo/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/corpo/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/brown/corpo/internal_corner, 0)
+
+// purple, new
+
+/obj/structure/chair/sofa/purple
+ icon_state = "purple_sofa_middle"
+
+/obj/structure/chair/sofa/purple/left
+ icon_state = "purple_sofa_end_left"
+
+/obj/structure/chair/sofa/purple/right
+ icon_state = "purple_sofa_end_right"
+
+/obj/structure/chair/sofa/purple/corner
+ icon_state = "purple_sofa_corner"
+
+/obj/structure/chair/sofa/purple/internal_corner
+ icon_state = "purple_sofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/internal_corner, 0)
+
+// purple, old
+
+/obj/structure/chair/sofa/purple/old
+ name = "old ratty sofa"
+ icon_state = "purple_oldsofa_middle"
+
+/obj/structure/chair/sofa/purple/old/left
+ icon_state = "purple_oldsofa_end_left"
+
+/obj/structure/chair/sofa/purple/old/right
+ icon_state = "purple_oldsofa_end_right"
+
+/obj/structure/chair/sofa/purple/old/corner
+ icon_state = "purple_oldsofa_corner"
+
+/obj/structure/chair/sofa/purple/old/internal_corner
+ icon_state = "purple_oldsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/old/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/old/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/old/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/old/internal_corner, 0)
+
+// purple, corpo
+
+/obj/structure/chair/sofa/purple/corpo
+ name = "corporate sofa"
+ icon_state = "purple_corpsofa_middle"
+
+/obj/structure/chair/sofa/purple/corpo/left
+ icon_state = "purple_corpsofa_end_left"
+
+/obj/structure/chair/sofa/purple/corpo/right
+ icon_state = "purple_corpsofa_end_right"
+
+/obj/structure/chair/sofa/purple/corpo/corner
+ icon_state = "purple_corpsofa_corner"
+
+/obj/structure/chair/sofa/purple/corpo/internal_corner
+ icon_state = "purple_corpsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/corpo, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/corpo/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/corpo/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/corpo/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/purple/corpo/internal_corner, 0)
+
+// blue, new
+
+/obj/structure/chair/sofa/blue
+ icon_state = "blue_sofa_middle"
+
+/obj/structure/chair/sofa/blue/left
+ icon_state = "blue_sofa_end_left"
+
+/obj/structure/chair/sofa/blue/right
+ icon_state = "blue_sofa_end_right"
+
+/obj/structure/chair/sofa/blue/corner
+ icon_state = "blue_sofa_corner"
+
+/obj/structure/chair/sofa/blue/internal_corner
+ icon_state = "blue_sofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/internal_corner, 0)
+
+// blue, old
+
+/obj/structure/chair/sofa/blue/old
+ name = "old ratty sofa"
+ icon_state = "blue_oldsofa_middle"
+
+/obj/structure/chair/sofa/blue/old/left
+ icon_state = "blue_oldsofa_end_left"
+
+/obj/structure/chair/sofa/blue/old/right
+ icon_state = "blue_oldsofa_end_right"
+
+/obj/structure/chair/sofa/blue/old/corner
+ icon_state = "blue_oldsofa_corner"
+
+/obj/structure/chair/sofa/blue/old/internal_corner
+ icon_state = "blue_oldsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/old/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/old/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/old/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/old/internal_corner, 0)
+
+// blue, corpo
+
+/obj/structure/chair/sofa/blue/corpo
+ name = "corporate sofa"
+ icon_state = "blue_corpsofa_middle"
+
+/obj/structure/chair/sofa/blue/corpo/left
+ icon_state = "blue_corpsofa_end_left"
+
+/obj/structure/chair/sofa/blue/corpo/right
+ icon_state = "blue_corpsofa_end_right"
+
+/obj/structure/chair/sofa/blue/corpo/corner
+ icon_state = "blue_corpsofa_corner"
+
+/obj/structure/chair/sofa/blue/corpo/internal_corner
+ icon_state = "blue_corpsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/corpo, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/corpo/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/corpo/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/corpo/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/blue/corpo/internal_corner, 0)
+
+// red, new
/obj/structure/chair/sofa/red
- name = "comfortable sofa"
- icon_state = "sofamiddle_red"
+ icon_state = "red_sofa_middle"
/obj/structure/chair/sofa/red/left
- icon_state = "sofaend_left_red"
+ icon_state = "red_sofa_end_left"
/obj/structure/chair/sofa/red/right
- icon_state = "sofaend_right_red"
+ icon_state = "red_sofa_end_right"
/obj/structure/chair/sofa/red/corner
- icon_state = "sofacorner_red"
+ icon_state = "red_sofa_corner"
/obj/structure/chair/sofa/red/internal_corner
- icon_state = "sofainternalcorner_red"
+ icon_state = "red_sofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/internal_corner, 0)
+
+// red, old
+
+/obj/structure/chair/sofa/red/old
+ name = "old ratty sofa"
+ icon_state = "red_oldsofa_middle"
+
+/obj/structure/chair/sofa/red/old/left
+ icon_state = "red_oldsofa_end_left"
+
+/obj/structure/chair/sofa/red/old/right
+ icon_state = "red_oldsofa_end_right"
+
+/obj/structure/chair/sofa/red/old/corner
+ icon_state = "red_oldsofa_corner"
+
+/obj/structure/chair/sofa/red/old/internal_corner
+ icon_state = "red_oldsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/old/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/old/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/old/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/old/internal_corner, 0)
+
+// red, corpo
+
+/obj/structure/chair/sofa/red/corpo
+ name = "corporate sofa"
+ icon_state = "red_corpsofa_middle"
+
+/obj/structure/chair/sofa/red/corpo/left
+ icon_state = "red_corpsofa_end_left"
+
+/obj/structure/chair/sofa/red/corpo/right
+ icon_state = "red_corpsofa_end_right"
+
+/obj/structure/chair/sofa/red/corpo/corner
+ icon_state = "red_corpsofa_corner"
+
+/obj/structure/chair/sofa/red/corpo/internal_corner
+ icon_state = "red_corpsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/corpo, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/corpo/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/corpo/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/corpo/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/red/corpo/internal_corner, 0)
+
+// grey, new
+
+/obj/structure/chair/sofa/grey
+ icon_state = "grey_sofa_middle"
+
+/obj/structure/chair/sofa/grey/left
+ icon_state = "grey_sofa_end_left"
+
+/obj/structure/chair/sofa/grey/right
+ icon_state = "grey_sofa_end_right"
+
+/obj/structure/chair/sofa/grey/corner
+ icon_state = "grey_sofa_corner"
+
+/obj/structure/chair/sofa/grey/internal_corner
+ icon_state = "grey_sofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/internal_corner, 0)
+
+// grey, old
+
+/obj/structure/chair/sofa/grey/old
+ name = "old ratty sofa"
+ icon_state = "grey_oldsofa_middle"
+
+/obj/structure/chair/sofa/grey/old/left
+ icon_state = "grey_oldsofa_end_left"
+
+/obj/structure/chair/sofa/grey/old/right
+ icon_state = "grey_oldsofa_end_right"
+
+/obj/structure/chair/sofa/grey/old/corner
+ icon_state = "grey_oldsofa_corner"
+
+/obj/structure/chair/sofa/grey/old/internal_corner
+ icon_state = "grey_oldsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/old/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/old/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/old/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/old/internal_corner, 0)
+
+// grey, corpo
+
+/obj/structure/chair/sofa/grey/corpo
+ name = "corporate sofa"
+ icon_state = "grey_corpsofa_middle"
+
+/obj/structure/chair/sofa/grey/corpo/left
+ icon_state = "grey_corpsofa_end_left"
+
+/obj/structure/chair/sofa/grey/corpo/right
+ icon_state = "grey_corpsofa_end_right"
+
+/obj/structure/chair/sofa/grey/corpo/corner
+ icon_state = "grey_corpsofa_corner"
+
+/obj/structure/chair/sofa/grey/corpo/internal_corner
+ icon_state = "grey_corpsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/corpo, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/corpo/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/corpo/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/corpo/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/grey/corpo/internal_corner, 0)
+
+// olive, new
+
+/obj/structure/chair/sofa/olive
+ icon_state = "olive_sofa_middle"
+
+/obj/structure/chair/sofa/olive/left
+ icon_state = "olive_sofa_end_left"
+
+/obj/structure/chair/sofa/olive/right
+ icon_state = "olive_sofa_end_right"
+
+/obj/structure/chair/sofa/olive/corner
+ icon_state = "olive_sofa_corner"
+
+/obj/structure/chair/sofa/olive/internal_corner
+ icon_state = "olive_sofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/internal_corner, 0)
+
+// olive, old
+
+/obj/structure/chair/sofa/olive/old
+ name = "old ratty sofa"
+ icon_state = "olive_oldsofa_middle"
+
+/obj/structure/chair/sofa/olive/old/left
+ icon_state = "olive_oldsofa_end_left"
+
+/obj/structure/chair/sofa/olive/old/right
+ icon_state = "olive_oldsofa_end_right"
+
+/obj/structure/chair/sofa/olive/old/corner
+ icon_state = "olive_oldsofa_corner"
+
+/obj/structure/chair/sofa/olive/old/internal_corner
+ icon_state = "olive_oldsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/old, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/old/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/old/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/old/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/old/internal_corner, 0)
+
+// olive, corpo
+
+/obj/structure/chair/sofa/olive/corpo
+ name = "corporate sofa"
+ icon_state = "olive_corpsofa_middle"
+
+/obj/structure/chair/sofa/olive/corpo/left
+ icon_state = "olive_corpsofa_end_left"
+
+/obj/structure/chair/sofa/olive/corpo/right
+ icon_state = "olive_corpsofa_end_right"
+
+/obj/structure/chair/sofa/olive/corpo/corner
+ icon_state = "olive_corpsofa_corner"
+
+/obj/structure/chair/sofa/olive/corpo/internal_corner
+ icon_state = "olive_corpsofa_internalcorner"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/corpo, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/corpo/left, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/corpo/right, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/corpo/corner, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/sofa/olive/corpo/internal_corner, 0)
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index ddd11a4e78e6..64b4c656bb1f 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -512,8 +512,9 @@
/obj/item/clothing/suit/caution
name = "wet floor sign"
- desc = "Caution! Wet Floor!"
+ desc = "No running."
icon_state = "caution"
+ icon = 'icons/obj/janitor.dmi'
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
force = 1
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 534d3b052bc6..85853ba5096b 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -288,5 +288,5 @@ WS End */
/obj/item/reagent_containers/spray/rhigoxane
name = "medical spray (rhigoxane)"
desc = "A medical spray bottle.This one contains rhigoxane, it is used to treat burns and cool down temperature if applied with spray."
- icon_state = "sprayer_large"
+ icon_state = "sprayer"
list_reagents = list(/datum/reagent/medicine/rhigoxane = 100)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index da4c5d0b68fa..8be0bea8a313 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -2,7 +2,7 @@
name = "spray bottle"
desc = "A spray bottle, with an unscrewable top."
icon = 'icons/obj/janitor.dmi'
- icon_state = "sprayer_large"
+ icon_state = "sprayer"
item_state = "cleaner"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
@@ -162,7 +162,7 @@
/obj/item/reagent_containers/spray/cleaner
name = "space cleaner"
desc = "BLAM!-brand non-foaming space cleaner!"
- icon_state = "cleaner"
+ icon_state = "sprayer"
volume = 100
list_reagents = list(/datum/reagent/space_cleaner = 100)
amount_per_transfer_from_this = 2
@@ -388,13 +388,3 @@
if("sprayer_med_blue")
item_state = "sprayer_med_blue"
M.update_inv_hands()
-
-/*WS Begin - No Cobby
-
-/obj/item/reagent_containers/spray/hercuri
- name = "medical spray (hercuri)"
- desc = "A medical spray bottle.This one contains hercuri, a medicine used to negate the effects of dangerous high-temperature environments. Careful not to freeze the patient!"
- icon_state = "sprayer_large"
- list_reagents = list(/datum/reagent/medicine/c2/hercuri = 100)
-
-WS End */
diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi
index 94df693238d05123b4433c12a5c13e86071ff4c0..b80be47c795dababf7d3449d1e5ee4aa0cfb7aac 100644
GIT binary patch
literal 11720
zcmZ{~cT`hB_bz+@1qGB|q$6FLh=525NEK9kG?V`P5}?eGY+6GYH#R{W7RaclEMou
zRKFf3e&VQCd-zC`<77{2{DBg^^ZZECa(}BwLvZqv-A9B~)}+?Yve#lgmB(;3q3VbD
z7NO77ZVcu={8u2h$ktP7J8zs-LwZ`%o|6~zEr=dpO>IPLwq0l-&%E
zWELU7_{EkdjRi|Y^=a{m5|&U?Ur{0=R7rs0c=>R1Y2rj@U~Poc>PwJ>$f6U;jP9`0
zeI|R09@muI3bcG;zUUh^i4UkBI}c}f-M{?yZ`zuc~zU5Gx;JY08y_M=J}OBTs+yFnkEP5$B`U4m9E0
zFkQ?c%>jT7c&;e_+B5wi!y8ULg}s8X;}s+D)Hw$%Xk9<$>&q!{;T3bfPtL^*KfA;ImJk^&JrO=LN3BnJk{pmL*oo-Wb+;+HsBTUitlg1op<6@V_%Sr4%
z5y|+}xw!=^(V8?b*$O?=xr_yGo4>>FGttA6+qWO^@&aLskG?+L@xkY$d=81lV~Zsf
zcm#09eNrMsC_bwE4#cPu(%u6o2Reu+E^erD!amoSiFzyH{8b^*HS&{|pN}E5i{;|g{x56aUQy;~@dYXyp)IZ&2I4pUktA7O!eoL@abB>9hjex?eyJh`fs%pyQw=tb}Pc+M)_(T}|Rw+;Z%
zjABaJp!vmSzBd4PzPO8m*uHivtueV#
z)n!rD(_sHLKCMjGxf&%Pq(O&QolHzztw<E%!qqPy(wIM_nK&QKKB`KX)_wgG!5qQ7
zV4@)hw?wC=TnxSTTimL=(_SjIeqXp*W*HPRTkl{w4vv?4VL*9PiXKs&V=bZ@pcDHN5Pgy%rl-VSZ>uspReSn01&{x5AY=|Q3vwOwzmG*zNNxq2WyYnIm~p{#nGp+bi&ohJ~F&K2ibgH
zCky|3)=IsOT8eGRxGs&g(D3NQ+S_4H_HA*y$OUS8Sfpq?LIFiZzBQLL_~F@iL^JSi4bHXEqu0X^bv{=CZY91pxHN
zn1h>UoZUpoZUSHWsAdvOh814E8E)u^;>Ny
z2Jd@v1kJ7wk%ZZAektdZAy@Myce~q}j2?`@s#t6@DFAlvvNQ;}QPF-HO-^&RwT2FK
zT6zKiW|?z;adC030zTF%X(%oh;QcAMTw{%l1aWU&J)+6Bo`l~-rp#WhFI$cpE7X^l
z*U#VaOHlxHTKrhk2#ShjT?~j`mC@qAUL-GV6bHWl5?KRHQ>|Z`@1;z@EiB
zO_Cat4c3m9Ytn`?J!~;WQuo?lq@h)0r5Pgpq;3YxM>-I!9cLDwBK(2OX9QM9cKk2mNDT~hB4<-e&#o}%zr^2BnR$ev$V0`z
zK*vt(+w$iLx9mx%inJD1P{?xu{r+x-qiCDeGxEQOA11mAIEOYUuQ1JL6(0IuYmah*
zv^p)qTz*sBV1O=eOzfQ-IBSx%k<KU}|y6)Y9xWgcMhx>FW_;af4@_GhIBg|MSc}okbp`3X_`+{`3Z0P|t09y!$iiji`
zf9msdJah$c3Yc`w8CKR6I%}mN_a@&eioZAiW4#Jn$tEFa3o&3y)+WLLeFz*mK4F2;pTnTw<0$_qUIC|w@+*Iy2>^q
zP6IOKUROAis?i7fc;9`(yj`AG5*1Y_1?yk+6_l?8%Npl~8sQ-`h_$cIV5C?Jv38Jd
zN^eEemE`0oPr?w)3yGml_Oj!T-0Fl{eWsW9ah2vC7E=WH9|
z>r~~G>G@i25j4AC>bCw5&(nvL<9Gmw!Rgqq6W5u%?WKYiN(Nu=)K-R%wp@@l_FnJC
zE{c8W*Qr*rz*5EQ(ow73@Yv2yUVB@eMH?&UhxOCq_$VKCHreC4tyhj6Hu(k7o0GW;
zc)-N-P5_f8cu6$`w)pe2ip9VVlmo?rIDnHNf>f^N@Haf9f8n#bN$YY5rsqsWc9Zb6
zw!=%RuhIJ(mGB4t$EIr@m2>5{A^x*>7Cx?8W`W^Z3to1uNVq03A#s}a?9aehrRY79
zw9jTWCIsV5k$B`TW39mIgko|JPh0!32?M~fp#po9`i(fLpjs!T}Q^{
zFvr=jG`&FUJ3P^9i&fyL(&xq5kHacxpc4Q+ALMELV%faUbF2#eOaR$vdZX7(vR*~=
zt>8QI0BdBdk);#ows7>Su+VM=1%L?p0xug+IS=B-jT1od0UUQXwhII$2z`l^&@@5>d|%WJ)N{oDN{bY+{71lyPUClw6U#D
z!&X4Yws*ZZQ!3Z>0KNavX3K1=(CvY$KXkX^QCE5h1O*Tj3a)$GRUM|ty|_B?e!9Z$
zGSssNoS8^m8yD*c?yOvNP5LLejT45HC~HDCX?p<(wnb9wn|e$kk)NdvcmFpdT5&N+
zw^pm6RBQ3nZx((U8457czXX+k_4V`JDAi#>2u#mRz)>v^+xvEd6ZyXeZKcI+%{2
z0iT`=@=dgLPLh<0Cl3Xs9QJ$X|B5^(p>yy(oXNUA52J1mpX$Aw=F#~t}a`$N#-0%7_;_}ZL>bN
zw+X^~cV&MJI~G?1y9OQP6o`ytHR*!e6X%q{X{Yxq*{tYjNNVP6LhAM{8c2ygZ#TdW
z>WZ}fP%uAd>G;j3=#jYic%2HA{)&KYRBO~Vo*;VQcHMVmIamAfmz#1ES$L{WPk&%B
z`icWdG~!}-K{zR6FO+i8&{muX^8Kj4Jm|Jb@MIQXNa>A^PIN38vTui)1l$pSK88F6
z*u~J`1}5_E{G0e%h#nK+=k2ZvKl^a2rQNzC00`!aq7-n_w-#eiT!
zWlvBCO?&N`2+(oX{Bfr%3sOW1pdyr(+}EsGrjZ>mqu(>HYqSgu#if<>wXCLPVxa7ha&*>zz9q
z7D)&{M44%&bT|2|=
zrFNZa5KAz4q#gDxeQkcJXLNuvrFqMz|6#}(cb<<0*l@5;W|&N~^qSF(aiIH%(h`Ql
z*9#B)$V*&)sjYC~J+NzUzuI4mV6u9)!AAA*?=89qrT%>j3%K(s)Y3IR<>qmdgJUQIhO(Z`ii1#~=W0t$UYrPUQ#{3U?Gzl0t)HA6I
zG?9$f(?CK6AYOKP5?3Rm<{+|EGI6L|m(tI+)>d}Yd04IO&y#FV1mN5U9sqK0^ly{X
zlD>*}9TQw{V7)A9BpB0Ma5BX@aQlJGFBohB+|v~}hZ&_(X+sImUvuz2_JSkI$sDhLA!yk}Nd
zg*5Ge0gURg(b@$y4Nr;-etgLUUDXt>L|~SO+fiS~&ZdZ6zC$LR2HhvfU||j~tBb%O+Ad*7`zNg!`%^ys$}Y8HLE^;7-Zv#w5*4@N#lV33@tEcg
zP$D@e<)%mAk&tjPp~AEP)qntHSm6UN$lHOG{-B@ge+CTMK-$?+{w72gjMY3V?>?C2Zm1*=#s3)|
z^;Lw1g3&7O$PD;1iqyOxTN~d4>}0TJDBgd^&rTSV`83Ih(ocdo?Q
zli1o?a4RRra>?nIZ-=6tYc<8n6^7GcBY8l+rka*yB&O%a%zOOmwQpq_!>aJBwV};-
z(W*`G#F}aubkJJI$88nZc^+F<+7osq`WqmIda^Wa5hicqAO^}5ad}28%lG|^*H<2X
zwK*gP>$DMaC5NEwRx8cr9NPLimml%TZaRsdOB`8l^agG-!<>H
zhE2Zecipe3qq}%6FPof{6kc2VT3{&iwwCcY$WYYBRD*jd2_m?Zb-XDcl^EBmF5yhN
z6PE%wLw(8(L)Qjm`zRD1Uhw>>!cLsk7DhiscL2mzli@rZmOq@fXu`)u1=
ztg%RfhI#t1^vom+CpB)p%Ka|S{aTES!Vko1+htP!;d-D^@1i>M?ukOFqs3%6?ty?V
zgSG<{TB&b=Iyq^;+aLhAHB~?LQU(;o!`_47YkSIz916MoAJQi@1yw?Rcl0zHBsC{|
zTW5h*=*f>#0qOFnV-3e5^|JA?=${`PPbE?|hE2Elg^$P<$fv=9{;;19)X{x2|k!?;U&DDjHSWG@KQ
z3;!DN{@`A!un52rU{oFI8JC4q9HHs$RLDA-iw^ZZ+_c2c@ftSCSHwqH&xsye{8c{F
z+j$0JgVoNLeDXlxv+s_T&4!_%g$%6b6TzI0ehOQXwI6=Mc2vT4D0zg-hEO99uAhS#
z4>*#Dq?V;yOf0|GE?BQZi#nfw&nBwc=7~!Nwv`3(KYXvceLF<0rFwsy3(l;>|;P35S@VZpgDW6w>Y2
zp3gsrP9&3+PU$}uPq#)+3{A2)3r$sOVd#h(W?xO$tC^arALJhF0nr6GEUS$F^~b+?
zGHA^3BunVxUZ&7RYWMau3Jg=%c{uLZEb?xYE2Q6L$IQVD&_h8NgO?)J-Tr|Cw}u>#
zfxWH^dy>-9dN3qRtNTD7y#cvtje90aa
zZP&>P_RImRl74>sGx}Bk!uU3YEX3-;;LAe}U+btktUSGtVuisc>%9kd>ZUh4!8{Np
zPo#B!BvXPAQ^axPu*c4=JU!n(*YWI{!ru#wqvLMU*XjY&X=}RFXzG-7cYBw9i0@%7
zYLyk@!Ele*i+(;13XXI(;QGnJ{7CK9r{p
z839b>1c;1|ou_L|-IHmeSN6q+0<1rEtavyRfM5zAp@s3s8yAJZ!9Xbl#xF45YI01R
z_~+$?QR&1q#~;Oyeim}AG8EFAe&gN`rI3QYy@D}iR!C+w;Q(sZ%la)9X^2AMX(Een
z9c~{Bk^ft)6?94va);tuZMd$1C5_Hh7OvV@zmMg<-b)v3)tu}c+OO-1j9eB-NJy~U
z=*|^++UuXLP+&BY>06#0sI4LBO
zOPqY0hX}DZ?c7OEt^b0YtiP03%_rA@{g2|icY;eVr@-iO(i;%1PqnVoYI*1TW49eS
z0aMgd;(s*N1+nTA%E*JS=JE3R+BKsKk92A!QO*^hC*G
zQv5ve!^nUltuk`ihNL4`O*z4ncrc%AxgJPOoovX=odjUI#2m#~9rPhsQdU(NgVE<)qI(PXAG-M08c;}n=ajxRQ`XNpWPl=Z
zUTPjmot53!rSE{;fH6F~K?o?I6#yS}yvpMWI-;naph^(X@A0T2H%tHO>}sVS(^|Zb!YtpiuUq1E!Ne$dkyNLZ+ht@@TO26@G)8bnz?`uX_c)}<-3n=$DVC8L*N~07+2qCgl
zYD@Zwi-zla{jj5gO^dqZ#+Bv<(G8IP(0rSC@ccKs2m>fa0wT%C+l5p>QV^TF6m19S
z=%WIg3QEaGQ?NPX>^Bh)-vu?k;cRQeU2l(ZTE+uOeD3DD{2~R#*iUBYjeDuAueG%i
zQK_j+-bi6Tm@u6;CJ49T2qt;B{4iRJE&i)4twEi)Urto9sAO$gh`j)nHa83B2RDM_
zF5JC1k;$H!%p+SysCvnr!mO;7TR3vL72L)(a_KQq#k)nIE}f`D%^-*7Cz}x?2gsq&
zHc{+@s$j!=pIGsC(z4Q{?!f{SQv{OedkbrgL6`Jj_?%*<3^J4M;m7OvgGnN^$ETa|
ze-ag3$8Y|YSz-V{%&)oFlJh_`rsii~DS7pLmq};*i^bGu?}BNXHVDi^D}=N1kgxNJ
zoJw#zr82t?g6zwt??&C%i3qduTA4_%50;{FkEAMj;&^hb(Bl+YAVoLE+r}%^uL~n!
zlFF?Ve{1)C5-e6;_qGD`eNXTjj(tv4NO#K{mtg%^*EYf_l=bFseb;}n?ugX!ks
z__LuN9@%5BCI|dVfqdrn<*03)u5qbDZeX+F1{GEFn!PTpC20jQ-`rO;7`|Jy@tj}!
zUY+taPk4|_D3_kK__)v;-F;-(`peOx2YXoPkSX*%SsAhU1=Og-^I|?61JV@|0=6-&
z(dM%y7rzv{f;H&2(^}21WD4w$=}i?q9dP^Dd7blkK>)xt{HA4L+BDD-1#??F@U?dz
zlCy9d5)>WBgk~}CIXYM_gAb1zsg^fY&Xm=De;o`D7Xh~*X8(oDUc%$B6;lkm+za7{
zrc;{z-dQ+qd>$m=)GTd$12v+%$Y<0Y{ad42jjO8Y>*n^`hB=wf-Q{%_IH{w!=-=G3
z#{{uQW$X2{CYPC?j|3VPVA+f#%
zJ?09xW1F{u2QFh}C8Y%;b6|&gV&PMJnFoCzPP%h|r7cnCPGy-#3U^%$1by0e^{LNk
zfF%39ubWf;2Hu9fWML|ibNyOrcQqeujN_O!|JxMsYBaMyMW@73tP+CyPYW`&%FE4l8Xw7l>!#TGInlCb%4O^)l0jV1U|Oz
z`<`F8phbiaDcd_uk19dx1YNp{xrSI7Y~XYouM2qdrRh7{NkcB#T6O*ynCqyx=se4o
zgkW75iBwr}*EK;D`gPYmJB}zje~a`RS=5R#U0cO;3Piwg{@Aji5B{oWDelN{<*Lv$
zS}Z#j)AsF(9ZV?~&g$-HbAa3q%&vm?LG!&RTY29D?7mw0NxV^Ci4*^CncQKce#lIs
zU*4OA@&ea6hRa<3_QUiu^hN_uTg9QDDm?PusgFvR(2&-s4wdLk`=Fu!gNbO}!T$Kd
zLBsn4T6a|?m%mEWzHlO2U2}wx%X%FAyyrI+O9mX-su7)^lE%Yl&M#GhPai#A(K~}E
zp5gX6ex8zyFA&UnpBhaxIAu5%+<|&$d@D@nQ{$h?g23KhcN+@Xgq>ZR+V36<7xr>v
zC8{?|RB`YszVFP>>}ST#VpTlKr@aq%F+AA-7@~dLuM}|XkY~Kehkn7uR5M`rf7hJ{&NiU@-dYEV?YqBOU$jAvCs|A|
zu=Xvg1|h@TgQFwinH59dP{;;MkE2xv!8g=$#Ilr$L0@gJ^f(dWuEmucJpR%^gzDR+
z<62?Ol15^B$e#SC#hJ4Gvm3BnyamI^WBchx>r{|cEIZ;7J0U}3m&5CBV#Ay|U;R!F
zzTP0=8+wSHEAU!o9CxfCp)>Wk<$oR?2X8rx5PG*pxo`k
zen_KCvqZuaPg0GyZi1ZlX_%s|(M@9;Hp;LKDfjW~cFycfFpA7=F{kR=4Jj7y)(|`jm$kXF6C#yC+!fctX|4Wt6
zzyX*N{!f(|*uwHjZpkK@F^2E(#dfk!8x3!Y-9!T9V734Q=WpK!_NoT~fK==HEXh>VHe?IsxI^HSZ#yc%WBsd{1THxHdsK0@0b=>&vTpYdfGDp@Eyfm)=z0$z%inAc
z`T3u0PFkB>qEv7`Jx??+X(6@4g~Ou?!k1g@bDz;=N^?0*7o;QYDEE5XHd_LaqWxK>
zXm#IAi?6QQD|-!eU?hpmRxU{om(QbZaF+eDy~SH&XuOmz!Ov*X&oVKBzvt0JLOALf
zVo$QXy~5Yj!&6C4nuAH8-=4Ljg{Z#u+28}^x=x5C8@=AMBBE?--#;~XVD6hn5!E7j
zO1`SL$7nG0izYn^sUXWk&
z*L6k>!ZHyI{~hOf(eXd76+OFQJx~l^K0RU@?nNs1f)A{kp!46CpQ?3upo9GLPK5p*
z{9n~faqL4T_Or@5|I;i9d?}3mkLf$GCh+);rE^Q+364SiJF4q%!|t3o2n0-z=!A94o&NB`IxDWC^>fj4
zJq7|$r`Bb7IG#3X2Nd(I2bh21>sFU@UAyOzI_b4*>J441I{-d*dSReS*Ls!t`N8&T
zSNVH^pQzSHz=6pB>8S<#9oKg}ioio5@HFPy?f>srKazIKJO1nGtf6q|z@9H~Ab2f}
z6%5Wp`~>4H=<9{@smqC^$PvFb`FeTyvYq&FRglVg4qNxuf*Xl=Z;{xEFfE+i
zT0_ulF}(R#zHZ=BAIG#M%)o|D;#K}KMrnGSyg6zn>8)H4x65R0-Q)FD&a}Hp^muHH
zg@&2mz_DQtY%jijVFg(z;!p()-w}bv4Qt)#G_s)=6|2|mjC65
zth~7Tm>DlTRZg7?ihM$j|L27xohd5k$-L)_%|~tgaKH61o=VI9XvFhS)%zk*3}R|W
zuf}zYoAHlktGbi72>0xqsn$MT~zI~%i*h{ldmgSd6wH43Mr{gh7~tW&4*(acDnq$@o`?&Y?+
z8A$P708=xI*6hha>sowm@`@*rwzATP*O6$qvOYW)@x;VPSm4Kc%H{W~sbE+jQOW8&
zk9_Vo+3#Uj1ULn5Xn*}#@2Pi}%Lmi;`3|igTSMMzCuOhOZvviV9eT>Ek%?LAYw=y(
z0HWexJIGpXzS^3k{}N_p#rsztwUu%?DBSq>`8b1|=j^Os-bGj>0xxRU`?C{o~{rBi5))feN
zZgk|w+{su`Mj1V@IJnZ1z*=iPL@NY=u&%(-cO07!#Pjm<*f=;iR9m8W`Z?SDj!$DI
zr0~Ijcw*i55CAGS#&A{8^Ne4|Tca6!(>}({AIiFY%cGyeuh#7Za~T0$4Ma@#kmuIi
z3W)|nVg(bgrD-#erRVB1Y@@$EqJOfTnBLN{cu}(iLheXCu!k$u^Z6Hvc#Xa8{kv06
zp-FB|r(yQKevB~44B}7NuW|kso(EbPU0Y`jEbQE4h{dj`-&!wf)<4s&
z-?+;846%4Q!fNC`EVl(^N(zqXp2W{QDq=}%OY%O}GHUGqT9JQONfulI+CE#KQQIUU
z9>1L3~8)&$?KMfu#0=&)cLpAq0=xSFJ
zWx<|;e+B-|bW4=92gfl%##khx$piKg+y$g*ZHbeg#2
z1f$*+2i&G^{Hp}dm$l&)JUQN&^@DjShzp9#Y9#zeRF)Y3-LL@RcU?SnQ7y#ynNoVl
zuV0UjvqY_TXr?J%{ZQdBSA{;FZBu;p$|Edn_Rkil
zM&o7A*k_s$P38b+6_0onx$OX*Xe!11o0-y%_$_U_Xa0L)?z^wc!ApnqPn_8tms`R{
zGo)Tj+kI(e^+RZ+T?P}q>ie};g=Ehe6Rz#q8-=)TtYGF8kn8a{6MFIeeqN!H$pnb~
zEYfA;dwbB89GM1|b47K^u48r8EHE%ITOp+W;JLKZvh-b`-1I?znbFMg$SFzJw|isz
z9rXuSA@uK4P$-jT9i&l1`LEr4*MZBw5y@ulJ3fNH$8hV_ERC*n!AEV|l^=Z)x8QwN
z+mp0#orM>=W7j%A{FTbw
zReiPmlxLyB2aOG>3~{^`>%YCmFZh_c$}<`HSpAJ2XWMX#iF61@z&PX
z_VoF85>_fB+KE=;?LD$zf6LbzPnYg2PW(~{_iJct{uHqt&6eYxXyu0$*$j#S6OPZ%
zpHJmw|M;r$OF5b;EHaXmN#-N9Q~N*hWv^{!U3odLwPu){AJ7pN54}Caz{rRPtPoyN
zCkv;$cuD7XZSSX4v|oNC2Y0Gw=@i08=Xu#ztarz=KAFB7(7V2<{ai^?vHY2t|NjRo
C$yIs)
literal 11891
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
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index 19b49a6d34da4c1dd23e9d1f956b567d76c46c55..47de0bdd1a437edfa309db0582b9ec0dc32bf2c7 100644
GIT binary patch
literal 28882
zcma&O1yodT_dhyAryyMd3JB62(ujZ{lF}vJAV|jypma(JN=XaSAW}m}cXzk+&@eFf
z%=dlYU)*)?fBk1I);V*|lRH0qKYNH!f1^lwS>7a<_1^bNyiF;tT?Lf6GWzb#CV+{xp5^OrheZx^3}~i^1$gUv*}=)|G+j)%+7(T?e^czpVlqEV*hR(mzjjXRom_prYfxS~
zlPwJiUDkfrvyMZa6g6FFy7bGzmZq?LD#U|NGNkys6&;e9w}&Va!nmWhV8dyR)26Pw
z?G%7F9kOTeN|`xyC2;~gzS^u9@x~_Q2iNllOL@7}FZoqj9b^10KYyWzN_Or%6Icx$
z8mb@RJ8Lfd(Czi>>(9p7dzd^hKyQk08!i9ukf_I3j(g}&#lLh|!$QxUOIkqOi7Cfm
z3wnT-jG$NYvfAF?_M82@$tTaT5cH#HZV58nPh}V}qA}tbaprFBm~oT87pNO>92eo>
z*ka}|G6tv2Jqeb1SWEWNb(E;);sr5=tXm~fQk1&-ILB{{h_!LscvWUejJ5B&JI
zExG-yFQnXudIPgq)jp?5o|dHr3>o;9*Ivw(?e9C{pgw|93x8`sXlQ6bQMXmruQrY{
z=F1-Y?`lr3!MIZW=bO*EDUB_%d|ur+e;~b{neN3m4kQ^r8u7($>pCD20D-|^p@mc-
z75Lk=$?<|$vqUURLRO4(ii+#6Ut;p}S68l&m&dm_SN8Ata`4B){C>iM&OD-o2-VMP
z?8f42<~J-j35iz`qPx-lj@xw(;l{Pff!JXe41d0hAp0h92K;@>CXhj3_$|Xp<94=S
zgPQ+1J*Zih7)wS*CL8RZe0hbNn2$7Wjx>2CIr>}0DCD9rGV)|mr2C}0K=tJQhnJDT
zWhE0jC^}$^WjA42Vxkp9h+xNGRY~O+k%21iw%i`_pUqsLkxWl|H-`k7T0Oqau>_qT
zncdyIHHvQC86{hM~o!(P!4Hc;AGB1An)QfS4SND{f0LX%OjuG78scqG2w2&`k%=5BA}6Sug6+1U=R
zruGMB>)|vO4hS0j!IZ~7!A=tqJ>x<|vjy$h%e4lYjWx`HOaV#((@c)HI`tkfq&Ak>
z$#ROyGa{n)5cC^>JD;5A*FI}<-p{)|(@QSkdF~Z~-?y!g__e9I&HWypI`yE=1!+Vh
z?8tU=v1c=L(X-kyQ)N{`R;oNs`Tl)IWx(yW?Bzc@>g@EW3&=VleX8=#>8Q2drrT`r
zZ*47e7M}(XnGcS^j49jQu%@aYL6lS0u}a
zLy|CVf;?8ujkHjgGl(ixZU7FwiP5S~}
zYW72Q{nP28aJ1AsD!>Q+wd7m!;qJymCEx^BqRY2dtWgDzi;SIcR7rw|7b>hCyzDO>
z*_A5><$h;6Ic)6bwHwn;ORa^oEF%|e+MCvJC6b#S+SbF~nC$d*a@tv0HaSDUNdnM`
zq@bRjfdb7?>a+vntgvtD`O{=jix??&@+)d9zEYa>|whkp-
zbsG|dB?c=Fa_+Dbe)|!L=!c_yyM`M@cr$&|?rD3#j;?N`8TsOtNRt{g=V{G%y7_xT
z%62K?swMc`~^(-5ezThp}bSeUZQy-qB|I
z-bUw+@0Nuud|?~LzaBdr`}%*J|1gi)`5d~P`IVE)dyi1;@3Pc$8j#@n!(mAg{hMy-
z{c8rFSaU?oz@ne4OPqXRXGJus?W4ObhrbsApAV}Sk%o1SweCJL@A^}Idhb^%sv5sQ
zE80L7?I@i=%%H0t%1mwS_+ft@Cl!^t_QR4xI?@>eF+dfu(o}>p9Zd5UTQ%Ev{KtAV
zA3kXxNLehzqk&yOnSRbyg74s`dey#M=R%}UrHB9EfMkpu70JlS=9*)e!lMp$YH;dK
z7Tgo_Crfm{xIO!6(u_7Nbt{p0e>7jt0I=WsQaBd+)K(22G7Jg_E6;tP#$9ZDw@_`d
z0cHeoet{9=Z}DLCj)9>Uqodw;JT8pVN6cMnUpNB<;GTvK;3_QBj>ACrAY*)#X#8-x
zVfO64j-u26`0!FiSE(tc^?N=?o@@w%9I&byyIB%N_fzfpfU`D*{X-E-{VR^M&^N$F
z41WFYIJ1>-zof5mb`N|10xy16f%nN5E7qN*=C8Y>S1DYEqs@LIZ%Bmb{WF?I$ZH+S
z=spMupod4s{+aH*Fs|$)U}i~DQ1EdER$gItFX!{rjB-OgiX+X2ZsY0T*YSID46bZYC=3n}sl
zvT@c3-&Xo&@WgI!F-a}?zuxtBZsA&b*AZ$yP#@uj$W@G^uRGj!iPsxAS@3_IB}F)0
zZYmNG2N0kqva64v^)OuYy)mI%7H$Wr2ziqRg{IXfS_hr-PC$R&efN_D%&S?m>hj%E
zNSIlY%8|=R55MmjhTT!y3*MUv&0&x&`48jH63l#A4cZ7c>2I7N>TQ4T!83htO4JY7
zO}N+y`?6(=35Skm6CWd;I?Ze!>n%z{C1)v-PQL|hj~V>|VuPm4K_OVumST^Z0!LH3
zr=5iH?aV*h1hm>_b-uHHc(#n3x^W^PYy}+4-zOYvC~DYsjB8i>N8;gCI-Lr~drEL_
z?Tb~TNZY^tQ|9+rtf!D*`8kpG^|_AYn0a3k;0U`^lYE~(H3Mk!RdI0`O@GSE__=Igg?X
zGr{r-FTYo{JJnZ3*I2~hZ$pwGB>}`q+xi0_|MdsCifZvG&5iQ4Tqm^$lHNFJjhC+a
z7>Y^K`U!-#HnI;xR9m0mvq?$Oce|ffI$kdq&s8dzEWIjU_Wkz&>#Qw|0e<`8he9H{
zvhM$M9gN)f^Sw+4cHV_vlrnra=Ue2Mw#H5R>007(bwa*g7l0LYcFnp>jCFGf+s
z=(HgdQz0&sQ8i6$vSKmvm#*vWJ+jnJOG0|nr=zYW6s>|7W2)NOI{asLeI6OKA!@t*
znql))VuYi(aOMS5ZG}d@Uu>o5nMADHwQ!|w5lqy?MlwYQaW%A-{=+zxFpbo
zv4oEgE6|l!@Ze#`?ImFO0VC8|@$N-hN(W=UXr1G1WXs(Rbsrz_-kOgpJCIDRWJW*W
zB1v}OkB1PTT=G*Z%}Pu88S{tK{-HwkOWXwm-y#7UH}YGB?hQG)!+l_2-|2#8Pj7RK
zPA{5N@m6fnZ_FBSWy4L`YMzc44R<_779T-py|P}D8?RWrNAtjhFqE+jjn1Ovc7
z6No|DQY&6T5XytU1Q_m~Dhj+(`sI{bcH%Z-xz+E^QmC_0MHR#*z28>fpz*9aBiPji
z)@&3R7pG`sWJ5qJto_Rg@Nk>0>+>!=sox9|`pwT8J?0-=yOg9Uy^(u%I^`tJ`5PJ@
zl~6C$b1D7ZSR5qNPw{JgEx#WG{o%g7v8PFYfe{yjr@Z#G
z=$aYr`AQt@$C#fAKoKjeH~9SM71h+EDiHtCe53HKub*m2WTsZm^{B-RWSi&#^R^MR
zl4)%EZcEV5S;;G(mdS%clU+sjssrbvVjZ^XGaQiiNoqD9=pKvuH_AmLo~)aT|BZ#~
zV`tQeD$x|t3~6fvuB1zm!7-_@r-@?w6F=Y}EJm`m322fc0Y0Gdmi_Dyz<<^Ij=B3Y
zi%O+suclAix5*l#H7pj|X5x_nP_)j$SnIEqv~mu6bIpK;i|$u8@lAWeXOQeAP$ktx9Xa8cUk%8fNi{3q+a
zZwLTG`ZfDgAS^MGge3?qNv+d^KLF5nP4goccO8=wd(o(^A~`6hA$O)9sz
zWHXKVENI@my8fyHpd>Tr*Us~O-rK^%250~ylF849Ul{!`fca3EF<(9{v*V%$(EMgT
zDJnqv5c8R;0V}(zJqGiXa&6Hob@d$9B+JF7pWxuNp|8K%HLeybJN?laKv5mWyS!T`4&{{{%3HpR
z->`lWv|~@yKmr~;nnnzdR>bKK07dh4>@8oGEn>a{9KZOgT!?K7INW9v9aQ
z_+gXAMAd*3B0ynTY>b0%M{wt#O#Uu6zrEmb_({hIo
zYBjyTp=9sqT3bY4T80RSYH76X-y(q!En%dY7I46{Nx@${z@V0f>&p-&+QU~EuYh3a
z+J_YYL0pnI@FyPzfA55AS49&Bv?yf
z{Bh}VBXfM3k+>OYxxAgdYdbaU{4$n9w~Rj_giTXG$P-wLz}r^nZ{rrdGNp@v2Q)8-
zZ)Sh?ynk^M5kaRT{h}0x{wL=8Y+OyHva%9>Qj_bU_u+E}moRBw7$OQ5>i
z8QokF)4Y}JXdrb>&30|D0{|Nd%L=ms=l1T$e>`@tmb)6u=Vr?cslyOZp{_C0NkOFm
z=Cx=+0zvYSW*jiG?KNY2l8NPJdh$NTVCo=jT+HO{+HM;8^}!*Fp|0MtWXqU
z5~Dt@Sg7p9B9_kH^~_InvH?VCJ-Tcxpu82@!`**9a$1KY#fdj?x{k6E5fUx85>|YI
zs00TZS`KapRcnBL^#*il$Z49mNLgwUf@FT}@Q5`7~8k^Fz=H~7$N9lE7XKcDru(A#H2u>zAf
zdlvyDgJ<0$q3e6OXth&$@agNO_1095(#QC8q5#lX{eO0PqK
zcRjECh!UTw*5*e~EM@S(NDPMQ@f5Q8E?_e2ptm$TK&FMIikWs~nN~2zPb4~vS6`C`
z%rT-R18TAdRHY#{<0M0EWc{BU1zvbkM~0+L3SyI$@yN`$dkB=PT45(!PwLk#yb}cg
zubxi)FOoLgs1^PwbrsN6DiywafQ6z5*}&cK9L_fawRljrp+^f-*URJTO%Xv5DmBtR
zw-oe#IJPZ)(!nEDEU~KcP+5eODI1f2P6G}Hh=yhMH*dEm;OT3fJYW1p@0k0Z=HmKl
z>sMN=s)}>Rg1^6Hm|nlYiCRLGIG}PUycg0A`r+`==R=0i@B%Lop;#*r-E#9kTDg{+
z<+|3%Y?}bC`M#9AM37{P0_{yevgmcX;M*;$yC5JzAP?AeV6p*@%$2t$pSC`4b<`M~kDZqlW
zxFD@Vpm4PR88_FcwN}3v4!*{ht@;4U4)`Ewg6ya585WN~Wr3EXn--@Gprvio6^+YA
zX47)fBQsP6zn`4}VKVcQg4yU8Imuwb2mp>BHr@`tq`1eUZ&~Srnu(Z|+JNuRJn#dN
z$9pu;@+1NY
zPkpAaXMPUpYOC9xYj$gBtK-yo8sG()g^j@+^VA1w$Pq)pU?8vjONw|M3sB2t&PyQ4
zr%6x$@z2Zt_}ge3VVV9cp(`3xEZsLSnsR;ApU&cwayMOGlef4VZSxEy@Lz%A!-W<{
zR^t782wLNNP&JeORIXXuaB9|boNoYJ0+MI6bsX$$mOAW=09pd61(ht=fL3U%jlI<`
zY2p&%{Aqk-gHI)L8aHIloOS4ixQcA&DGfm1clGPB@K?+hzh3PCD*8fKiQYnal~
zfvAvZv?g-#Z_zwuAEPypfdshl#NpV4`Dkp&=`t_u|39>%XixB??d7%F(&px<#KeeR
zDfxiN;9|NOJOQKt8~dyqg+3Rb`+7ied|A%rfy4qJ4e)cF%FC6<*DfR>0C4D`Y0`Cn
zT2XPn^p)kkLsOXz7{FL4JO<=CgdnF1j6IAaqGr|@{qvVxSJ!}afj+yd88HAY&_MDv
z4%i^u*)>n2rVrF0b&tbu{>FVBnJaw1Gcl9+!YvmHBuS|TqBUh?Kyy)XN!#GST;sOk
zIMZnmS!xp6F(*5Jb$wJlwC9|29^YP
z;{&7_C+6DGJ&}hMbtK|{BJaV?q^#niR>06X#Yq9%z0w~qK&9z{+y|ku>_7tuWV(pB
zmCYl(SEDl99C4LdRBj+@LhvpFcIgT8K
z1z?_1p1Ra>;iZoKnOY0e2p?ZGzJwTTP)X!O8QKNrwT$%L*|?^oW2wKyf$bxTj25g{KL8X*YXthL
ziSq|@<(5t%GV|QsVR2q57C3HU|D`5Ahqr6QjAy*R;7PdpcuiPf9;tKMr;jO%2}52L
zJAkj*SDO1t_;PsSZ;=~lAZ2CcFYIPqjx!Z)=Ku)xTZ9-0Svu?Bm^MsccDj$;80+_C
zV^&w?l^fF4FzFWp;LNV4NdR&NsW^<7pSdn31c5bLD?3z1AbOvnO29kejlYQ6HR~MedT_|71ior@#o2hUC7Qg#(lUPPV{7BOhJCxTsSyO&oMa
z;4`B1m;efVWSBnf3XXXA!SwM#!xCQvLz_i|rAMw~h#mdD1Kyo6OAQSId4mZP3)GS|
z+Z;?5xk%L{K@7nSi`AS9npcP%1FN$Hrm|GphBKFI@ORR%6T7aK;t@v<0p2pl;{8WS
z@P~+?HsC^v@V`py1by>-g%gO3z8|dFtQ7ye;uX3)uo4{h&)b*8dQci`GCZQ?>J_h)
zEKGao7V`@@U}-(StxOtk$d+>ox{&M9sO9w^b%i
zpw0F4!JReN^{7L4|D$JsS2M&zBYjsBd#bG-yo^NTu_bHyW#R$NUabXbz2^q(-}1zB
zQ0_`_I?38YoQH^^V^WOut?A&bM{<&@IeaHt)S#aT_eLkX$5$Dfth{cL$4d`i0UL7>
ztll_CCj*v8NExjE=v9@beDJb5lMRx>!}qV4~PQWfO8~=C2Qmv
zZ!)2piC0vVATXp&1C7yF&f1yUj_6>My*_?YFz>#E76yHF9*`Q;-C`HbAEGGoEn(?&Wk6
zO}vd55dBXrz%XYF){`c(td;E!7j~S1IhZ2_ijtZ4R&5M32y1fcy`XU5-LTUm5YbB(
zKtM%u{k_@PQTs5H__1;Dml)xAty&nA9wYa)8HO@4G?eJWALId!NgvomOcT64K3y#o
z2I)K*(J3QE1ogUjSlCb9G6R77^sBMaAB%@csHvZ0$;?j`kCv}&ce{9M;k7Y5M_B9R
zz@ezAOUXW_Gv2=mAOWn?u!Syv8v`BUO~4igOem0hQYPep1t+l1)z`(m?P%XKyHvLw
zKQIvSovsGpDSPRk485*Q6nfyc%Wk86AO(aJV4hOoPqNy$4*
zm^;FH0k27?11}H>7dH--KR(^w{)|Nv8I?^V4jYe($AAeSJh4bQrNRK%Bb^McNDu3K
zj%{)*-r*u#@=^BzU@$_nS_ifxx;eE`5+(@J(ZbWGltqcPq3Scs%}`=sT6DsYsQb(q
zJYbbi@Rej_pm^5Ruf56SNdZC@_sfpgXa(mp7@!2(O0akAjuD{wCFW0(HS&7Egk7n2
zf^6G-S$?2wPAUJpW|Frk-eNJa{P7cNSh49)Yi9cL7JMLw>i;&PLQ@LGO>vw8|EsRP
zVF|1i`IgcZBD%mr%Ey5E!}p$1L;NW)VUmH|d!S$zOy%S8j%f2$z8e&MIAr-X&ZKN4
z6oGi`k#s5}uR}j8N&rgK_2T3(QF3~G;RNszF5m^m3|Uq=J`EXfu|b*XX!z=H8k6Jd
zb(GJWCsP6HCS(|?+N@qs1&ws(ym*<;6m@^sDEj=CcqQ(PFw6D=IaA0$dBw{*f^h?-5c1dPnF%cv;qUbtJq>&6Lqdrla%j+0Qxjsr;SW3N31?ehtHGeJ
zA`nMI>+cBgu#zeMA5qJFNfQ1;#xZ0Z;jQtAgw{={THb--J!We?ve*V>?aAa;1z6eb
zj;vI}yb^@n{LITZdP(M=3?|>ayi{86(0wsF_e1M<4-ZpX&swZ(AR}+@Yn=AiK4>K5
zop(f?9y;SH?a)w?Rnx8&TY<1*xd`yPaAT9;AoS&0VnD<0Z-
z0~HXm8ee`y3D&Flgo7`9xkB@$#*OpD
zZciLHA1HYUpFmIxSPKg1sse+^zm%^cUe*9EPfAt4jGNB{YhLf2LvH>~4j2i=&u&TbFv!PT$5yOKugSzf5PnpR;pmGhzieNTK?!B66GYyRDi~ZN~
z$}{O&Fe6@P(Ud4pC*Wk)vxIK-r-Mb75rw08r!*&+=z0W41pY2UL_0+zk(6{_&l72B-~cPF)>^rw`}`MiHwy2yphAqu6}$-!s?C;+)#+xB3X9*7vT@Z#1adOzcd~eh}
zk^e}~n@u$S#%?wT6tqh*C1h4f72j^A&nfB
zevf1>Ebz9PqkFE+oX~07v>*crPg9a=we_He{-y$Op{-eu_=K;c(p&tDF!nSskVSfB
z7hQ;YBDNasJ@NxU-=UgaJhk+v`iRbcLNc~Hwcyp3l{Y^->+(_poa`2=-3ao%vOUZNgP<}ExK*W6zQ*PwcY6(n1<3%g^EfVgCB`YtzWQw
zyX&)@T$jkog4Pjvx3b~0%y2VH#AQ}Bt3VhapV?BA)xdSo4VkXwv2P%>g-EG@LS-Zm
zibjt)(dqIl-sox%U=;_Gmit*b3y;dklKTZmVnT9)T@mMC
zYpG$Iqu<=^VA^fEGjcfXmWJ}ap@E~PzkihO&Y`!Tq~?+?<$?+hcPqNhy3TBs*=dla
z5rB>Mj5~^#AWZiWnmT6~eHNuxy_9Ulx+GhJh6+CsK9aCBzu`bDe&B0pp2;gv>mRC-
zskYU(JYfr7LkrWEFV(Uox*|%Sj|~5Zc?961?nl
z-xUoo!2RtvuI`A$>o-y6)U0o|asgG)&GIh#UU>#!)7Bx|&!5InkqhZa%8RYH!n3&d
zs6Gj!iQ~gAFR@a<8gp(vO?^+r+sgMLg;~py1cGh2ElrvLcxmKOByH!gwM
zEy#fDQ+L?r(9zNMHcQB+>Z)BI=@+hdj92KXroYkNa?!p_V;#15oWz4H4@GE7U3L!f
z+zlP!F9Abk8wLGHiTOT|xLrxymkPNzHBB8xF?1j+>y}Guz9CH<#^Wt5%|p#e3z9Ky
zJJt>iUZxJL5=f;0>}s*?Wq?(f1*<$gO=_#b?_p?hLWPwY4-??w9hY=s!v0sJ
zV~dL<_4^8wGuIg@ZM)kp`-mpXiW=g9;<>ZnWwF3HmXoHGAra5OLMzvsYg%!Dkd9XW
z1l>3oJg*y}3b8alsm*3;-Up0uf2GLoFoX<^>?5fm%H(%EjKuQ1Lg-Xt_BCWn+;l$;
z7M50w4)Xhpq;$EWWpLJiO4}$M963gr7&i)wUK-1ShrZp(QUxhM&z>>S5TJFn+$HQ>
zGGf$%{~3Xj)?ucsK2M%1i1-gMNqpeB8KlG0bYGG=S|&W0?OrNCTtw9Ctmhf1ofw0*
zhybd2J#ErZIvYDcAlHi%fA*tbFdcJHAcjuJpus>F8}x%3-8x76ewm!iwvI_4M4cZk
z56Q42`Pepd7qzh4xSwdP1xRol{Am1_fPG1gh_MU#!_ZvCH=mLoei7kUMT7c$t;3uY
z80}Migg&B$u%4UgAB4H?<~265WM9BpqJatVJ}@yh?mD})2{Os5oqV;k
zFpP~h7`#79o{Ka@{(@C=E#0_>lIOaJFnH%PDH2)LQtf$+oy}}}Dti+P
z1&lu_DnLNm>-0f*`K5g}6_JTHJ0fXyW0@4Ry7b8{9Bj6zmN6W0ZhMg0dc|zHXB<)Y
zJnv0ECquSY-7M+36=i$lY=NBze`eUUfOg{~)$`2e6R_1p;=FLQ#4qg3Rsb%*Hvwmy
zp<1Y3aI_%0>b2=Aq}*ls)Ejv|%TuF%{4iH0HX)%<=9rNU
z#a+dh^7eHlrEW}3#-gN5#K4e%ToVds;0W(DmzxCva7a?Et1WpT8oC2<@m6S)URzdq
zs@#&>pG#|!Vqap95LTwpSK22g!vaA|5$7qQv>75HfaiOhBM}rT&Wgzt4j1{0j1J*=
z@5OpcPW=*D(y{*c*`?-%p_i}y$f+<${=_S$xud^R!|*Lr7HMcJU6DB`%V}}{xv^&S
zU-!v|gCE0h*FU`CJ0+xccA5I7{99M&_e1iB5%XV#Y})%v3c{q@)~I!U`c5SWY~Y||
z|JPz#wKU^x&%;uKPEUc)q=nLalStM#koJ$dXOI^I^EHE;v;=R(yJ&W`6qEpAkeQwl
zS67EK#nOwhAjy&tIBsv8Jk2N-+Kyx}ehy3sK!@v`J@0&XTo+UQb~U+D7rohsQnY^k
zEOq;8?}DX(#Y?OnP)769fU10&H|lLkribd63WHxrwajPMWr(2GT?i986^^L;1@_q*
zarslcm&2GCD_cF^4sHv3?H_Lkb6IrTeQ^U*Q-kUIq=^CO)OElW%!;3VF=jQ%_}iH3
zzn)*HL~?NW>#DapU92VHhqHNGg=#3nsKjo=kH_<*@FqGw5J1^{tWrLbQa>fP=^riC
zcb}LvmOaZr@DoYUs*UGsW72r{yh&=>LAGKO%_i&1*mrw3s3+^ut0f@rmxXHQu66d-}5R`S;5M)xT;>
z6R>F`r#lk=r~J$&@SgaYCvs9=`*6bR=8>U~MPo8CWJI#wjjlDeqj(Cla@HpRUGl}}
zJ}#cw+2@uW;vL$Oc70
z4DT(HmFP?R|8D(FLTjKChq&{(i)Ffe5&>>2d)$dw8r7gv4?6~f~Xpy0}bSQjgNco*47(yDvp^!-l})6=1l$l
zMYOX@tcOf>y)dU;jK=?i_x8zX!^T-U>jMv-3piIhV@^5axWQP%?x`7^??^%C_Yk+8
ztoK{{L<83VtX$bhGanp!@Zr-^>!*;?tgm9St3Kw&WW`R{9JDeds
zC)=!-1#PV@0q+X}=Bd)cq#R^()cEXE*>z(
zwQvbgs$2YteU$YZFcI#H8)+hMz6~gL&bpOJov44>fe`gP;bhuW8@auBsgpQ>dHE}*y*g%P66)B?c
z-s|T2XHTm*;~@q=QL2dRwc}#idM#tLPKr?NmatGr;jY
zPaRAPd4N+MvVkgE*)tfQUY~QG_ds1P=6j3ygaAj&C@hZHuu`^({3A1YGXCPH}?nAF`e&qH|)5G`WM_gj~kJOH3!oaOl+&+m?00!@$CybMsT
zPKZ1%9nD-4FE++8XrN;g*mDSAU-W--KvL^@dbfR&^OWwc)!=?JMl8M38^5(6_oS32
znf&V5L2=ug**2H-p?Evq^jYCeG_Z8Pt}KMXfp^<0>ZR)|i`Ri`xGylzhPoL9wx`x~
z-G{FdO-ml}h(3GqcNikq1#t$uqIYY11^(2P!DMm#9r2xq?fT)fJ9BNX#vea_tP0=g
z!VB*a4~zpdS(ti&qF41gA+*VYW9TKGcC90sRi;GTC-oKt^CPk%HRKs9fPGKJxkB79
ze;5cy@~dTb%dwdTetv*AQ3$z71fcwN#^)dm_ui#?Uqiwhc3Fzzc;>qVPfNAAN`thL
z4eT@grOK_T&mBrwPgrB2xxcq?t6}TIOzAUOal4U
z@xFIIC`RJ89bEmYw}2Qf_Ft&ll)HyKz=j}j!zk=!jC8T?=UfzOF0|@-ekJ_9h>1{ormv4eK)j~sKHfaOQy6^)p8YmT#Sq>(&|7WHA#A<7;~)9
zWjlT@`mt~o<~SiY0$de=UH&5+Rk;OzOG*4p0>j(rIbi#Ce6_91W+t^wA?FX`d?&cG_NBF>V%#@0;-))bx2=@v
zvMYernk1k1uwDIw`dHq@IeY5^3Y1{{V1q{U(J_(=e^4C%)%AW`%Z~&J^teEvat+7X
zmIj6De}^wO{t3W+5$2uL(v7KoxM}*-@55&c`JgIKG2+f6!_=m_AE9;>pW(A1kL0iM
zr{jPGI?so3nMtyoG0Z%#=rFkM5a)^jKkN2bVRXD6P0&maMJNiCCFrw3z*AJx@7zM#
zMsG`&9%fZCeq4PH`i>JJH|h=s*NgG<*!=k5Z-H;G-t}k;z%^g?v1;tTa?A*%e}q$-
z{Zqj6VvJrPHTKb_#moGBV5lk}{yA9YCHWcyz&-XI@I9u+4jdZ5P!c0O|2TkqaraX#NhU9;3Q8?Rgq*ENdX}=
z0YCgxqvcY86ZhwcL@BF}js!`OM!V^n^ihC81h!+s%_PqKxav3B@L;As6P48iZH&{N
zl-m7Uh`3(*7)ER6Ak~Qc`?W13>VfYHa=!Dx_yBoe)-fxJe~&6d;z7LoHa)O4u86H1
zLb4`Qetk9?^cfZn`pMZhn?7X|GzW@ra$}+-=D4zcoRHA`5az~8$1%&}TODT>`~`Ow
z`x-33lJM{bE;LR=reS?c8|el?HwSsHe*Kg;zzc7dUe)ch6~ccdcB@W0r6Vlee&?JLnHNv*%=2I_T&x?=Lz2#UG{%Kfi{sZbSo0Pqj$^Z)F
z6?LHyR1RY-ICwOm*r6QAM6GwqFjM;|LvNu6Ob6Wjd?LPAmm>_a{8T=+D7Qdh(oHpl
zk)$9KqcR&yr`3g5%5G^c6TZfL`3(q8BRxIjkLJlwm%rXzrk8M4uT;~A6GWs+@H5wi
z#}7Yh^zYbf1}t&N>~koJ8Im_=@{VCti=Kd#$Q}q+Mpb+0{+2+Ze!Qvpx2&ouABtta
zSg5XT@VAC)0J!|1&IMMY%%T*V04jx3Ie105u(SWf?~8phWq>^*bIpOm39Xy4MlsMI
zV9kUaIk>;KKGlm>0XQ8#$S-=4aTJ6F{mB8HI#|VDI-~;I@E)uk5XN#j`J~O>NzYXc
z3YqJrpWVJEZ3FXbMB~rEzQdEde)EDk9
zN3ZO5A1SvXdclCWEL3qtJU^y=fbjB&?5v6U^@5AgW3FydZw}7?15)&^y<8COs+;7i
zmpj%UsNFLFT!VQv?`1k3vZ?e45TjEPtGqGC7_gi;9%$L6@xzW+Tuymuv{p*^D#2QWh&_^GaXL
z9$209M7I0u=pW!FJwI?*+%~U>zdbL1mon4Bj{#8%hbH2EYvL0dpPRm{Yyh>7H2V=$
zYg8P`apvQPQ(-Q1W&^mznj;t!V?fU3kJWaj@9*WN_gjC3YFvD2--<(ye?{&`Zx3a(
zO3y7GPzJX8pci3q=m$Hip$sUYk(8m=mNyrU1);fZtZ_@u{Ncl`8*l~)JFS35pwu5GM8)K2;0-?
za%~Jvt-~TE>YH?hL*uF$fPy~&LB$J7V!P>#ivlvnLo)sR=iW7p5wQ!f#@)5mm|1(CS^%qj&nKsipO%nB!>dQoqmO1<&Ocv?y2z#mt
zGNK?&@M4$u88wh_Nek&R3;=Gndn54F`ZoRckYr%?_A9}BTFJYOJ
z3AW{+M+;PrXFCNTYQh)~R*PLW)FuP1d=&Os`h44K2Y$*4lR0!^4ypS2s0Lu{dLisZ
zBGa<^H6&To{XCtOc(SFM>;4hQ_iQ)fTW+^(!Mfn|`OY}0IB17w@%xK7j@q7^7K#J4
zJxE2bz-jx*UiRN80p0SPFr)-YAa?JF#{ChINj@0<>tvk;KN*mH35=$sY&ZFG9Xx|_
zNtM9sOd7#B#CM3ci7uTP*$dk8E@CKP#Z}uh^on@!_(MkMxTOKrw5NS8_031u&%heZG+`
zy?&*fukqvAk)S%yi##-r;u2q5AxGv|r&-Hu13F1(Lo77Ytn#O?DMd%a(!5%4($G~O
z)SA_3boQ#Rdfm+W^vIpReQy9JbxyC*{EpBI!AL*1JnmisS0-=~INVgQ_p8Q_FRUx&
zJW~CSq2tnWu$UW*k!|UW>#3WRfxwWQl&E&m)+u9OVWr$>{MuLCgnY+HcmZ)*q!>Z)nH0+)MEW&Li&3fE@$bg_qYPtT`;`>O*_CNz$HBoflU~nBkRJn`$
z5IFKrYy5K4xK+jmYJ+`p8CdpMIR(%`38JGR-s1H*Q2}9VT3`Q|v2ksbMu4d+)rE@W9-i}Qs;+L2KSMl3O6@owxywwN
ze-wW_AHpPsP3<#{*pN$Xls(rC0Vw8;9A2_wV=s}I)Jg7Un)?*=2RE3yd&sMOPvuQ7
z5?0B3Y%IgH?f9XYe^2N)l4F>bvapaJgsK2I5MRXoj=+ynISG*M;JP{dJ4b)={t@3s
z>ZQeYDt4Yg;qZ3|k{gU%t8oPm=E(-&9BnuH(Mh~6S0Rvl#I*?>PxBc`;w?PXZR*4M
z-?sy40^RWDaJAp6-tOPZTY{Hh$NR14(->xla5}_!C%xOe#qFDH;H7p($vb*{Ms8}5
z65Un0|MJ5AGz)0vbT+W!gZSjPa@j$jxW`%zztJ8gzjfAkrlF#N{=4QNKGpDJyZNvQ
z%)mMG2!E(&s&GBy;Mlb<098w%&OVB2c8h)13RE-5J_Dl5%ua^ffWqsHKm~C#yYL9O
zbluTMM~tM%1UldjL*PyD=6I+QsY#&G{jxYnk_yE8_~d;-WmxyEF!-bp9Vc?-qTo6=
z?{cX$^?LmBlFGzF5AO*FQ*~QqV?$lH^?gw%)+55&+Vb7Km?WH|(Ux(<{hAr!6hCRcS`uPmGt)_bn|t_#A8$j1gA>g*6Wr;eE*-j<}YXL^<^2EJb3bGIRd>El&3rEXzw`vHPT7*s8G
z;aIahi>?^#ispxBhz_zJ`qj0S@2JqvT%ew07#gOCKy2O7Vr6?l&KSgW+Ww!?-ZCtz
zFKQbf8flR35a~vc9uPsLK{^JcMFdg01`z3#?vU>8E(HVx=}zhH7~akAc|QEF|F`#g
z`7+Eov(MRQ?X~Z<_Fnf|2U+vq`|^KPcLo-M;ztu}ATuDmOO*m%V^f#unJ1=%UFEbV
zG&Z@}5k!Cb`^IE2p*q9Cl5lc#H?
zZX7azWGOf@2e-$NZ@0%@#H8`>1``CuLCi2mw<;aiim4n#>#e&2yt@jb9gexb5)zb$
z23MU0uNAFpfz26?x?|VS6
z3z`qv@NPgnDUIA|D&NBfMvuVFufEq$2?pStpLSSJ<|L{@ZH)SKhaoXoHPyvK3RgBg
zXjrZ0%?zTXF!vI^d_b7nh+ti0Yqi_%+3g$@K^-Bd0
zhac!FcUd`;M+uCi9IxYNLSac*bvF$uWl!mx8+dVG({6hj8
zOq{0icyhW`ns(N<0q(ac2CXG9tV1?tC;1d&u*5KE3xlHa{>5{*rSig^mjH=A
zJGAAsJR<>0esbMbUSHi2VdNgCbJ#2PN?EC+6RikT+_3_*19gY@SftHI;jqgTtxDyS
z0MQuN3uu?%F#fsW>2*mQy6EO4zD|F?ngf|pM0Z-}gaf?61agfI`Du$)CO@Z)0_I*^kn$un|rZis74U0FA)ClbSp)xsUt#0a|7Vx;Yq=
zts%WRUR0NV+=}SM@wi>qI(^lQZOP6f?4rC-lrjF?{mBBF^GgaNZ_{tv&x*9|Dq_$J
zG4kfQl$(-$k+g8uAFu@AwNbx8!JL$c1Iq6tS7Jjz(Kz}QMFj-+9bEtp0Fpk-Fo7+-
zIr^rpkDXv5cY#oa3XV9a@PP3CE|EPin1JXFTojAI{K6%5;y)Ms~eiE3@a?&afBOx-|QHG`Q`vm;~!8;g9R&trO4htd{k$vNk+$
z_je8GthBVS&R$NszdM>RyGeZY;75?!rj%0XaQAa{0pJqV9(jgcJ7$7n_~^z@N~c|K;``Nl<#8FX
zzp!~+kZ8h|UMA|SM4RKJ5SZC7l_%YY_j~CPsyl{2ERq$>#X#^}e(R{N(T?)F=novL
zpg|mA#+jEI6fwSb3cRbS6}6%552`_N5c+J8ov{KF639~&Y0g|p)$tbxI=q+JZD=^V
zx{6Mg8@tulPIoD5N*@0S3Gto*9TR(v$_58-vm>zVCAN6KN9?&82IiLmDg
z^&L?W7a=ZdIgT?FrD&C-AL)3%rV85sMGAir{T4}h;Z|AD7!lO
zhf=OZwpBA})Ya*aZToBFX|u=~BP+hL0DdHqusqOpT;vfHF_>y9+Y}OowDax=P9nw2
zSFiUN@9|`BFLeAlv(=rLHYwr7p^AV8HO0OuS6UYxQf2|SvSd&Rr|J0%A!K^6$U28|
zOQiJ!zwT(;XoV7jX63Pcmcp$++#)!Gom;PiCp(!0`qQh$V4gCq0g2G!=;V6gS8q02
zTC&xgSKj$SzQ{K5PT#A{F=*9$ezH5T5TDSnrb?pO)#$
zh4ah5g`b~I-Tm=iYrAvBUw1?`6WmejEul2fpt~*MSv1!6ioovq%#{e1yd#R?b}2(r
zTzO6GpFsDuDXd8^Pwym>DgwYI@$Cu4?zNQN%*ewDV1h@uNq0cYsYRd
zGFIw!$tl2ZJZaL9>2;Qn=4#~SC+6cP&biIX9o&?wuf!rRt=k8lU$WPgUUaL+im1jh
zYH36Y>fBs#{`lb}J>Ed6+u*DaC@tH>QC}y$69>^-cpJH1NhF@?t%sP!TDZ21v*|tf
z&YUCWesgzI^YpdECvEM_*Uao?hdF@t(7x=YUT4Cn#-QHMzE`KWQ3je$4NGZCt)
zW6)nrjJm}4MC)>ok{%{5bb4<<=UuNU^a@bUezu-lrqgWnC`~AoC%FElisYVZJzI=E
zmMAuAL2IoDijbP?H*4vwG#}t~+|w!@&?!)N|Q_IM{4aPxJgIo=%eYsAH1DC5-(kmt`q)+{H#k#^y|v3#M3$~Ofh
zztpJ}s9Tmjo!A`Oell$w?OosWpUkSqHW>-8r}K_X|UVm(KH
z^9(PG)||fe*O+Ow?x~8EbWulk$S|wJM6s?;y*-1|-b{|$L5ClPLaVe!)0^^&6OMy*
zcbJ4o;4#av@dRdb{g=E4nXV7(Oyu1}0w+Y!{&#++!aEEz&qn+lb4OOL6IS!2sC>%0
zf3&o8;(SODE4D_;dLU+A1|uo#W2*3_5Orzyt!
zX4no?63b>BqMYp~fd1+(N8jIRQinHV&9{uWVu-P6IpsT
z4iAvoz67h`%F7*Ks#JlCW`vWAp5+odS+0(NTfVHWoM@$d6-KMILysAAL$vwnhO{VK
zx;@?x?@8qQWb6f(K80zH@S74DEBaqDOVujPe1~Etfq{f0R6aMgmPk1_aw1e2E#J^y
z(Q6ibwYCSEUZS)OR*PdV&tGJ`1Z%mNIFdxYHhLTgb2Tyd($OCtmsOfJwgqT(4_TP>
zBe9+XyLA=06?mPxcBv%V()u-IJ2p3!u>Sj8tE$EQ$Z^|GV}-$}&q9qBx01T-TpU?m
z7}Xr`NBINN!WOIwTsCZflY_~sV2Oh@iq&by7qLAB(c{WZ3NlfP1(t3*>AKumZ^f$-k)5K&2rlm!{1TAJp<9;1luFX&fFy9IIXpCR9a#FGMYX0+xw^RWQL-9>vlRP@?%(%Ekdfb#d}Bt381d9k
z=!@&HNg)G1i_mqgW0dPA_|b}XfBQ9!D#ib1HTi+8CRJ0Ah^wxtnX_>f7|1%9a_*5m
z#rq0MPfTwC5mn7KnVz5PfGshfJQTM&JhcC^O%PU^N|oD9lEU7%Rf+XhTRR|z@FAP_
zR?=_1!B=eq`jWR*L4Y3{n954NXSx=tXIqjuiSZ`GYGj1BpvTLTu}FgZK)}T
z{H3=dt(OieuTK3RTjAXCj6xkVitm=oa5MIxY)qbePNuT5vJ8N*>*^{3flt-fqf0^7
zga`@M2J2Ii`P}-amGkiaJn+pYF*#Jrt+ue(&N^B*|7LpCe3%^K19iACz`e=rkI^6U
z{zJ&&=;5gcUnk>JqVK&;O_l%^ZD@Ma&3wYf!BRWzpnI*g`+$y+&_A?Aeq`%ySI&Ok
z06PKrURd~Mv*(d7TBdO~rp%V^t-q?9rQ0wg4jkP>*dLD+1lW~qv20QKXMzF)Wn5h9
zbFuSn{*k)|8)#|{7N47%ay_zbc~E(<;w8M6|unoo`$RP77rLi}#=0Bt=q
zEaXK;frH3LCS%&L%=;c3D9ZmX^`3);@>o_vr~dabr1G-hg!uUEZ8tTWKFaO@UGO;0
zi;KonasKzUg@r`(O&9HCu>FoGyVma!sTTD|&uxnDmSBJjdlX&genH!bsRK3L@-~5d
z$>2m9XzUfn2LO6hs5>NMam-LyTH5>2xXi1dWvd(f7iEf89E%s#g;`t`8Iz)^8N2zH
zff5Y6Lw_o%P97HJk*20*mYq5eVB6D+i&I0^7Lg}1$M1d6i|%-UFk`3`F*pWe{KsDa
zji_{A58lrKA%-Oj`gGdgzNp#hont;lhm>mDfL)6KtH>XzE
zj@7)j>KUCb`h8ElyCO#Gs~gyz18^}FFJqCoC>LAR8D^Hfy+#EK%!?*ixka}eZ+BkY
z{HfHm(Iw^b`zcB?@$=BAxP_kMY0e;*eogPm_uSW=mC+|BUR`fS-
zZ6GB`E~LH{1_nLYU`f(q#wCu{Y_%*I5?2}t6wqwlhD5&g3J=KR_#M9YTbAr4D?I^88Pf6%%=q*qt2(b=^HYvK_7~^&?Zuhnikr8+oQMFOo;~v!|(J9?fz0nQY<;+kF
zVCq@;>jmM3x%{ov+(GZFt`92}K;ch)>Sesn33PsLgglOz%(Ry-y-HKW;o&x+Qj(Sl
znm=M*vvIg$`0O`g%I2T7QA`GF(EHfTAjkwDG^j7O^GJ1mmA?Jr`P~g^GiNsKEt+}I
zm^q0NmLZpL@*oa~asK{LlgnRD8Vb}{n$?@?0f#Lhl=KvWG-84;EaV8))tiig2ZD0m
z#k+d(Oa0AzGBXQe*Iz@({i*GtUO=uJt;jWvjg1}n_`p|O)P-iq*q-v7BbVdVAn?un
zGK8*$x4rpLMmm6-<;PD_U0sZKaUNd#7C--?kuOt;E&Vuj=4v4?i667L_W=7@e8fy~
z7gie&vf-AE5327A6FYPk!tMXmTAZ6W0-3oA9!`^F0ycJumJC^51)Yp*Cmhf@8*>fCglOuDavRUpT@3xWg3op^~MJ^5?%l
zZ|;Fz^Z{P%deYI2SrF^rhc1C#WQcL|JmWwM$^)LWT`(WMJ08yQAr#Ljxf33a8ba;<2xC!m@!O+U|Wd&+aJz
zoEX)Q1o+U;5pb~LtUm;WMH902oxWfSc+8)&SLy>`EJ@#YKi1@w~wzqS)=^v1~QAz}iGI
zTLKcrRphIh^>k}3nE{_PnY
z!mAX-eBp9&hx<0=d#{vjhzgX-;wGKsrzE-fHH;kc=HUiqdN=Q_9xtTm(s(h)9HC3>
zYub5rhJOFiUIRwlse?TB3A%W%Z|K}!J-tWBr>JNGxBYbB6}kRZDK*(bW`M~g73LS)
z^ist#KaJH16B;Be4_Dm<#ta9FT%aet2$lICKa|g~4Jt
z3P(ktd7H|cZi30o3(*O_J_&D^m)!!E(v#)d{`}0AI}U`J$R62h5`PA0Lp0UV(78UiZ>R<`a$9p
zCCC{FWPGOH-fdhy#}^cr9Dwr%Rv3MM1$eS0JPmeYq_@iU*n;5*GH&{ZtbRExH5_F?
zV#%FklUnmBX+V%ZM`F{#!7*(i1{O?Y)%~f4E&#_U?Dmv&-9);XipQbj=qF?k>yzWDwLe
zBE~l{KV42Y)x@tiv&n@&QX`Jz+n_rXx)K4JUXY}JzFT)iCQI!;7Z#S5_u7YI?)Vaz
zWRXx5E4K90(=W}}+eOMDc|qDRPm-;zEti9qixF^r55(0!ohl1lBhNEU-Dz|b@A6h}
z=BE-#>}MbTto>~FK{;UVi}A+xa=ffPn9lkY^*SQgL4VwK22Jq86tAJl%Id0`u5M5W
z8PEIL=}PmE^*;)%Cp+^^<^yqo!ND>nCYhxk7U{O&6!$Z-?xbfn<Ex*)ZSVw
zSDo2grh56@YfBCW$#23FpU7+Ao@`3D)Im@u^Fvf5uYLg1FJpIi{$wu?4^JNm84=Ra
zMPSgnKxjl=YT0)eTErmqJUsX|lchE6HrY#b0v4g#?hsZEju&cbgjm?vCf)aI-&Nkw
zd0l2&GcCC*4)C;?_TdTCopU(tPGuH885kJ2Tj8(hrwcvs9?dQoO_(TY4xdMah#f5`
ztE47LEE-Bz>HDPB35g)PaL9I);bt8k&BrpWO{E=dm${p~5;jdUj70sepZlZN#>jgBg<1r!i9Nl@cgOQK9%TSv!gV0@JP
zDxOm}Ylo7*YZ%3}FMQp}P7BkViNNXrR&eW8zmGiqbp7vix_#Cz7FHqFr>tET!6p(g
zoV^|pMdu=XHN@{ep80lnF_oc$CcL@%Wzs8J)Hg$*^ZAV*?ycBe)#XBze
z6-cVCpn!xG`Q(W`q+Qaz>X*k>9{Blvam(@qP2uH}%dO=p9QY6B8Cz45hjeWuB<53M
zHK4Z}m|jAMEo2H^rUj%U>4?)j^uER~Ta5Qgqol5x6-Q*Gq;6=wpeS-gR@S%VE)Mf0
zf9SFFO{XWp4fL5@E&Lx}7(DA+6RHc95@J64T10ZgQ<#(y*hP&Cs2)q3|9Raik9
z=K(!Z8h6@-$F-?`_z``X=;FRZpCURW$NyLR2y|NBm`=>GXY;@?8T=b@&9h0ni5s0Rb(
z$8GZJ8@Guh$GQuQEG