From 8d93b4348145a17e77ee484055831787c0dc88d1 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Thu, 15 Nov 2018 22:54:01 -0600 Subject: [PATCH] Fixes a runtime --- code/modules/mob/living/living.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c637ef90f2b..62b9cf6cd65 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -873,10 +873,10 @@ return 1 /mob/living/start_pulling(atom/movable/AM, state, force = pull_force, supress_message = FALSE) - if(!(AM.can_be_pulled(src, state, force))) - return FALSE if(!AM || !src) return FALSE + if(!(AM.can_be_pulled(src, state, force))) + return FALSE if(incapacitated()) return // If we're pulling something then drop what we're currently pulling and pull this instead.