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 94df693238d0..b80be47c795d 100644
Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index 19b49a6d34da..47de0bdd1a43 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index e084df73a37a..dff68c8d4482 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/machines/borgcharger.dmi b/icons/obj/machines/borgcharger.dmi
new file mode 100644
index 000000000000..c60f999ea06e
Binary files /dev/null and b/icons/obj/machines/borgcharger.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index e7cd9797591b..1b156b9294f9 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/structures/chairs/comfychair.dmi b/icons/obj/structures/chairs/comfychair.dmi
new file mode 100644
index 000000000000..8b759be5f0f1
Binary files /dev/null and b/icons/obj/structures/chairs/comfychair.dmi differ
diff --git a/icons/obj/structures/chairs/sofa.dmi b/icons/obj/structures/chairs/sofa.dmi
new file mode 100644
index 000000000000..e8cfa4c5509b
Binary files /dev/null and b/icons/obj/structures/chairs/sofa.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 8111e833cfef..34279e803f1d 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1286,6 +1286,7 @@
#include "code\game\objects\items\stacks\sheets\mineral.dm"
#include "code\game\objects\items\stacks\sheets\sheet_types.dm"
#include "code\game\objects\items\stacks\sheets\sheets.dm"
+#include "code\game\objects\items\stacks\sheets\recipes\recipes_metal.dm"
#include "code\game\objects\items\stacks\tiles\light.dm"
#include "code\game\objects\items\stacks\tiles\tile_mineral.dm"
#include "code\game\objects\items\stacks\tiles\tile_reskinning.dm"
@@ -1391,6 +1392,7 @@
#include "code\game\objects\structures\beds_chairs\alien_nest.dm"
#include "code\game\objects\structures\beds_chairs\bed.dm"
#include "code\game\objects\structures\beds_chairs\chair.dm"
+#include "code\game\objects\structures\beds_chairs\comfy.dm"
#include "code\game\objects\structures\beds_chairs\pew.dm"
#include "code\game\objects\structures\beds_chairs\sofa.dm"
#include "code\game\objects\structures\crates_lockers\closets.dm"
diff --git a/tools/UpdatePaths/Scripts/2908_sofas_and_chairs.txt b/tools/UpdatePaths/Scripts/2908_sofas_and_chairs.txt
new file mode 100644
index 000000000000..8d6d588698e6
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/2908_sofas_and_chairs.txt
@@ -0,0 +1,49 @@
+/obj/structure/chair/sofa {dir=@UNSET} : /obj/structure/chair/sofa/brown/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa {dir=1} : /obj/structure/chair/sofa/brown/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa {dir=2} : /obj/structure/chair/sofa/brown/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa {dir=4} : /obj/structure/chair/sofa/brown/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa {dir=8} : /obj/structure/chair/sofa/brown/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/sofa/left {dir=@UNSET} : /obj/structure/chair/sofa/brown/left/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/left {dir=1} : /obj/structure/chair/sofa/brown/left/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/left {dir=2} : /obj/structure/chair/sofa/brown/left/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/left {dir=4} : /obj/structure/chair/sofa/brown/left/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/left {dir=8} : /obj/structure/chair/sofa/brown/left/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/sofa/right {dir=@UNSET} : /obj/structure/chair/sofa/brown/right/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/right {dir=1} : /obj/structure/chair/sofa/brown/right/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/right {dir=2} : /obj/structure/chair/sofa/brown/right/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/right {dir=4} : /obj/structure/chair/sofa/brown/right/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/right {dir=8} : /obj/structure/chair/sofa/brown/right/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/sofa/corner {dir=@UNSET} : /obj/structure/chair/sofa/brown/corner/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/corner {dir=1} : /obj/structure/chair/sofa/brown/corner/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/corner {dir=2} : /obj/structure/chair/sofa/brown/corner/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/corner {dir=4} : /obj/structure/chair/sofa/brown/corner/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/corner {dir=8} : /obj/structure/chair/sofa/brown/corner/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/sofa/internal_corner {dir=@UNSET} : /obj/structure/chair/sofa/brown/internal_corner/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/internal_corner {dir=1} : /obj/structure/chair/sofa/brown/internal_corner/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/internal_corner {dir=2} : /obj/structure/chair/sofa/brown/internal_corner/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/internal_corner {dir=4} : /obj/structure/chair/sofa/brown/internal_corner/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/sofa/internal_corner {dir=8} : /obj/structure/chair/sofa/brown/internal_corner/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/comfy/black {dir=@UNSET} : /obj/structure/chair/comfy/grey/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/black {dir=1} : /obj/structure/chair/comfy/grey/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/black {dir=2} : /obj/structure/chair/comfy/grey/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/black {dir=4} : /obj/structure/chair/comfy/grey/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/black {dir=8} : /obj/structure/chair/comfy/grey/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/comfy/teal {dir=@UNSET} : /obj/structure/chair/comfy/blue/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/teal {dir=1} : /obj/structure/chair/comfy/blue/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/teal {dir=2} : /obj/structure/chair/comfy/blue/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/teal {dir=4} : /obj/structure/chair/comfy/blue/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/teal {dir=8} : /obj/structure/chair/comfy/blue/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/comfy/brown {dir=@UNSET} : /obj/structure/chair/comfy/orange/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/brown {dir=1} : /obj/structure/chair/comfy/orange/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/brown {dir=2} : /obj/structure/chair/comfy/orange/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/brown {dir=4} : /obj/structure/chair/comfy/orange/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/chair/comfy/brown {dir=8} : /obj/structure/chair/comfy/orange/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/chair/comfy/lime : /obj/structure/chair/comfy/orange/directional/south
\ No newline at end of file