From 749d4435e59424e95eb74144b1ba48c28e68f92b Mon Sep 17 00:00:00 2001 From: d3athrow Date: Sun, 23 Mar 2014 20:37:43 -0500 Subject: [PATCH] Fix them faggot bats again Conflicts: code/modules/mob/living/simple_animal/hostile/hostile.dm --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index b70a3e27976..9bf2afe5998 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -84,7 +84,10 @@ Targets = FoundTarget break if(CanAttack(A))//Can we attack it? - Targets.Add(A) + if(istype(src, /mob/living/simple_animal/hostile/scarybat)) + if(A == src:owner) + continue + Targets += A continue Target = PickTarget(Targets) return Target //We now have a target