From 210ba28c6b371868b4280a36fb6f0fce6a381b2d Mon Sep 17 00:00:00 2001 From: ktccd0 Date: Wed, 16 Feb 2022 15:07:22 +0100 Subject: [PATCH] Undoes corp sofa fix This undoes my fix for the corporate sofas specifically. Their object subtyping is awful, but there is enough redundant code in there to make the layers work correctly for them anyway. --- .../objects/structures/stool_bed_chair_nest/chairs.dm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 2e5c1e4866..5466582125 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -320,21 +320,18 @@ icon_state = "corp_sofamiddle" applies_material_colour = FALSE -/obj/structure/bed/chair/sofa/left/corp +/obj/structure/bed/chair/sofa/corp/left icon_state = "corp_sofaend_left" base_icon = "corp_sofaend_left" - applies_material_colour = FALSE -/obj/structure/bed/chair/sofa/right/corp +/obj/structure/bed/chair/sofa/corp/right icon_state = "corp_sofaend_right" base_icon = "corp_sofaend_right" - applies_material_colour = FALSE -/obj/structure/bed/chair/sofa/corner/corp +/obj/structure/bed/chair/sofa/corp/corner icon_state = "corp_sofacorner" base_icon = "corp_sofacorner" - applies_material_colour = FALSE - //corner_piece = TRUE //No need to re-state this, as the parent object already handles corners + corner_piece = TRUE //color variations //Middle sofas first