Update item_attack.dm

2017-12-29 18:40:58 -06:00
parent d8943d6a1e
commit 6f8c2c1daf
1 changed files with 0 additions and 4 deletions
@@ -58,13 +58,9 @@
 	SendSignal(COMSIG_ITEM_ATTACK, M, user)
 	if(flags_1 & NOBLUDGEON_1)
 		return
-<<<<<<< HEAD
-	if(user.disabilities & PACIFISM)
-=======

 	if(force && user.has_disability(DISABILITY_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
->>>>>>> 5d761c5... [Ready]Adds the Pax reagent, small tweaks to pacifism (#33663)
 		return
    
 	if(!force)