From e1622359227fb2eba64b5abfbe92300323d40e07 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Fri, 22 Nov 2013 03:37:26 -0300 Subject: [PATCH] Meh. Added some checks to see if the mob that you just pulled to a location still exists once it finished their step() --- code/modules/mob/living/living.dm | 3 ++- code/modules/mob/mob_movement.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 79bd9c84486..aefe2d0f814 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -385,7 +385,8 @@ var/mob/living/carbon/DNA_helper = pulling H.blood_DNA[DNA_helper.dna.unique_enzymes] = DNA_helper.dna.blood_type step(pulling, get_dir(pulling.loc, T)) - M.start_pulling(t) + if(M) + M.start_pulling(t) else if (pulling) if (istype(pulling, /obj/structure/window)) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index eeef9836d1f..9f107361df7 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -438,7 +438,8 @@ var/atom/movable/t = M.pulling M.stop_pulling() step(pulling, get_dir(pulling.loc, A)) - M.start_pulling(t) + if(M) + M.start_pulling(t) else step(pulling, get_dir(pulling.loc, A)) return \ No newline at end of file