From 16e3baa55ef65e4bde15b469c15f4dbe754c3db6 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 16 Nov 2021 20:55:22 +0000
Subject: [PATCH] [MIRROR] Comfy chair code improvements [MDB IGNORE] (#9494)

* Comfy chair code improvements (#62842)

* Comfy chair code improvements

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
---
 code/game/objects/structures/beds_chairs/chair.dm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 827d454bef0..58f8662621a 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -178,6 +178,7 @@
 	max_integrity = 70
 	buildstackamount = 2
 	item_chair = null
+	// The mutable appearance used for the overlay over buckled mobs.
 	var/mutable_appearance/armrest
 
 /obj/structure/chair/comfy/Initialize(mapload)
@@ -186,7 +187,7 @@
 	return ..()
 
 /obj/structure/chair/comfy/proc/GetArmrest()
-	return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
+	return mutable_appearance(icon, "[icon_state]_armrest")
 
 /obj/structure/chair/comfy/Destroy()
 	QDEL_NULL(armrest)
@@ -227,9 +228,6 @@
 	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/comfy/shuttle/electrify_self(obj/item/assembly/shock_kit/input_shock_kit, mob/user, list/overlays_from_child_procs)
 	if(!overlays_from_child_procs)
 		overlays_from_child_procs = list(image('icons/obj/chairs.dmi', loc, "echair_over", pixel_x = -1))
@@ -241,9 +239,6 @@
 	icon_state = "carp_chair"
 	buildstacktype = /obj/item/stack/sheet/animalhide/carp
 
-/obj/structure/chair/comfy/carp/GetArmrest()
-	return mutable_appearance('icons/obj/chairs.dmi', "carp_chair_armrest")
-
 /obj/structure/chair/office
 	anchored = FALSE
 	buildstackamount = 5