From c97e8805f6fd181f9596e7ff0a0017ed636dcfb3 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 22 Nov 2017 17:53:36 -0500 Subject: [PATCH] Update hostile.dm --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index b3ad02af08..10d9fd93d7 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -372,12 +372,8 @@ P.preparePixelProjectile(targeted_atom, src) P.fire() return P -<<<<<<< HEAD - -======= ->>>>>>> ce82a2e... Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale (#32699) /mob/living/simple_animal/hostile/proc/CanSmashTurfs(turf/T) return iswallturf(T) || ismineralturf(T)