From 449ae34621aac1c5085c745e5867997c387ff0a2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Dec 2017 13:33:25 -0600 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 a11640808c..c677cd7035 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -479,9 +479,6 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega /mob/living/simple_animal/hostile/consider_wakeup() ..() -<<<<<<< HEAD - if(AIStatus == AI_IDLE && FindTarget(ListTargets(), 1)) -======= var/list/tlist var/turf/T = get_turf(src) @@ -498,6 +495,5 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega tlist = ListTargets() if(AIStatus == AI_IDLE && FindTarget(tlist, 1)) ->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829) toggle_ai(AI_ON)