[Ready]Adds the Pax reagent, small tweaks to pacifism

code/_onclick/item_attack.dm

@@ -58,8 +58,15 @@
 	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)
 		playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
 	else if(hitsound)