From 31de7874b5914bd524758404841b2e941ad87ee6 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sat, 11 Mar 2017 13:09:50 -0500 Subject: [PATCH] Fix some shit with the comfy chair (#24944) --- code/game/objects/structures/beds_chairs/chair.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 5659ddc6747..264c1923b56 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -136,11 +136,15 @@ var/image/armrest = null item_chair = null -/obj/structure/chair/comfy/New() +/obj/structure/chair/comfy/Initialize() armrest = image("icons/obj/chairs.dmi", "comfychair_armrest") armrest.layer = ABOVE_MOB_LAYER return ..() +/obj/structure/chair/comfy/Destroy() + QDEL_NULL(armrest) + return ..() + /obj/structure/chair/comfy/post_buckle_mob(mob/living/M) ..() if(has_buckled_mobs())