Update combat.dm

2017-12-18 17:26:01 -06:00
parent 078c8744e0
commit 8b56d1ccdd
1 changed files with 0 additions and 5 deletions
@@ -120,15 +120,10 @@
 /mob/living/carbon/monkey/proc/should_target(var/mob/living/L)

 	if(L == src)
-<<<<<<< HEAD
-		return 0
-=======
 		return FALSE

 	if(has_disability(PACIFISM))
 		return FALSE
->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
-
 	if(enemies[L])
 		return 1