diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 796994f6848..990f22edf83 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -15,10 +15,18 @@ var/item_chair = /obj/item/chair // if null it can't be picked up layer = OBJ_LAYER +/obj/structure/chair/Initialize() + ..() + if(!anchored) //why would you put these on the shuttle? + addtimer(CALLBACK(src, .proc/RemoveFromLatejoin), 0) + /obj/structure/chair/Destroy() - latejoin -= src //These may be here due to the arrivals shuttle + RemoveFromLatejoin() return ..() +/obj/structure/chair/proc/RemoveFromLatejoin() + latejoin -= src //These may be here due to the arrivals shuttle + /obj/structure/chair/deconstruct() // If we have materials, and don't have the NOCONSTRUCT flag if(buildstacktype && (!(flags & NODECONSTRUCT)))