diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index bac3f4c3349..2eb8cf115a3 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -90,13 +90,11 @@ /atom/movable/proc/stop_pulling() if(pulling) - pulling.pulledby = null var/mob/living/ex_pulled = pulling + pulling.pulledby = null pulling = null - pulledby = null - if(isliving(ex_pulled)) - var/mob/living/L = ex_pulled - L.update_canmove()// mob gets up if it was lyng down in a chokehold + if(!QDELETED(ex_pulled) && istype(ex_pulled)) + ex_pulled.update_canmove()// mob gets up if it was lyng down in a chokehold /atom/movable/proc/check_pulling() if(pulling)