From 6bd355b9caa98fefdd6168b8da5100b50d7209ad Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Wed, 11 Jan 2017 14:48:53 -0800 Subject: [PATCH] refactors chair layer updates --- code/game/objects/structures/beds_chairs/chair.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 9e4729ab8ac..5c6f41dfaab 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -13,10 +13,7 @@ var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 1 var/item_chair = /obj/item/chair // if null it can't be picked up - -/obj/structure/chair/New() - ..() - handle_layer() + layer = OBJ_LAYER /obj/structure/chair/deconstruct() // If we have materials, and don't have the NOCONSTRUCT flag @@ -58,14 +55,13 @@ rotate() /obj/structure/chair/proc/handle_rotation(direction) - handle_layer() if(has_buckled_mobs()) for(var/m in buckled_mobs) var/mob/living/buckled_mob = m - buckled_mob.setDir(direction) + buckled_mob.setDir(direction) -/obj/structure/chair/proc/handle_layer() - if(dir == NORTH) +/obj/structure/chair/post_buckle_mob(mob/living/M) + if(has_buckled_mobs() && dir == NORTH) layer = ABOVE_ALL_MOB_LAYER else layer = OBJ_LAYER