Update hostile.dm

2017-12-30 13:33:25 -06:00
parent 96358f62f2
commit 449ae34621
1 changed files with 0 additions and 4 deletions
@@ -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)