[Ready Again]Refactors disabilities into lists, allowing for independent disability sources

2017-12-18 15:19:53 -06:00
parent 3df26e3be6
commit 3af0aa2489
81 changed files with 711 additions and 221 deletions
@@ -58,6 +58,11 @@
 	SendSignal(COMSIG_ITEM_ATTACK, M, user)
 	if(flags_1 & NOBLUDGEON_1)
 		return
+<<<<<<< HEAD
+=======
+	if(user.has_disability(PACIFISM))
+		return
+>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 	if(!force)
 		playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
 	else if(hitsound)