From dbee77318d1717730ed55ae06b3e3e791eddadac Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 13 Jun 2017 14:43:12 -0400 Subject: [PATCH] Fixes things getting unbuckled in nullspace --- code/game/atoms_movable.dm | 2 ++ code/game/objects/buckling.dm | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 4c5f408f52a..108d70c0b91 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -197,6 +197,8 @@ QDEL_NULL(proximity_monitor) QDEL_NULL(language_holder) + + unbuckle_all_mobs(force=1) . = ..() if(loc) diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 78aa6d49e80..8c061ab5ef7 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -26,11 +26,6 @@ if(user_buckle_mob(M, user)) return 1 -//Cleanup -/atom/movable/Destroy() - . = ..() - unbuckle_all_mobs(force=1) - /atom/movable/proc/has_buckled_mobs() if(!buckled_mobs) return FALSE