Prefixed all disability defines with DISABILITY_ to fix a name collision

2017-12-24 11:45:45 -05:00
parent 2378235f51
commit 164db7ae9b
83 changed files with 957 additions and 9 deletions
@@ -302,7 +302,11 @@
 			unwield()
 			return
 	..()
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && (wielded) && prob(40))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && (wielded) && prob(40))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		impale(user)
 		return
 	if((wielded) && prob(50))