diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index ffaef501f36d..3b6a8c876337 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -105,6 +105,8 @@ user.visible_message("[user] leaps up onto [src]!") else user.visible_message("[user] climbs onto [src]!") + if(QDELETED(src)) // Table was destroyed while we were climbing it + return climbers -= user UnregisterSignal(user, COMSIG_PARENT_QDELETING)