From 9d17e63314b5e9e9b3dc916f2a4b42e4907155a5 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 29 Oct 2019 04:53:24 +0100 Subject: [PATCH] sofa sprites armrest improvements. --- .../objects/structures/beds_chairs/chair.dm | 7 ++++++- icons/obj/sofa.dmi | Bin 2488 -> 5416 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index dde9bce1bc..ef8da8a76b 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -495,7 +495,12 @@ icon_state = "sofamiddle" icon = 'icons/obj/sofa.dmi' buildstackamount = 1 - item_chair = null + var/mutable_appearance/armrest + +/obj/structure/chair/sofa/Initialize() + armrest = mutable_appearance(icon, "[icon_state]_armrest") + armrest.layer = ABOVE_MOB_LAYER + return ..() /obj/structure/chair/sofa/left icon_state = "sofaend_left" diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi index dafe06a7f12398fa84dc101b86ab7d74c5cbd3da..069fb1e08d6cb092e697d5c46a398bee25cbaf0e 100644 GIT binary patch literal 5416 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