diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 04cce099cb2..d7bfbbb0c03 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -467,6 +467,8 @@ /mob/living/simple_animal/hostile/proc/EscapeConfinement() if(buckled) buckled.attack_animal(src) + if(!targets_from) + return if(!isturf(targets_from.loc) && targets_from.loc != null)//Did someone put us in something? var/atom/A = targets_from.loc A.attack_animal(src)//Bang on it till we get out