From 1c5730d0f94d45bdf64e590bfc69ca7f11349deb Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Mon, 20 Sep 2021 17:18:16 +0100
Subject: [PATCH] Pulling runtime fix

---
 code/game/atoms_movable.dm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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)