Update species.dm

2017-12-18 17:25:47 -06:00
parent e4d6f4110f
commit 078c8744e0
1 changed files with 0 additions and 3 deletions
@@ -1315,12 +1315,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)


 /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
-<<<<<<< HEAD
-=======
 	if(user.has_disability(PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm [target]!</span>")
 		return FALSE
->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 	if(target.check_block())
 		target.visible_message("<span class='warning'>[target] blocks [user]'s attack!</span>")
 		return 0