Merge branch 'master' into upstream-merge-32311

2017-12-29 18:38:50 -06:00
parent 269208f687 48e0c47410
commit a3ebaa5de8
302 changed files with 4918 additions and 20468 deletions
@@ -302,7 +302,7 @@
 			unwield()
 			return
 	..()
-	if(user.has_disability(CLUMSY) && (wielded) && prob(40))
+	if(user.has_disability(DISABILITY_CLUMSY) && (wielded) && prob(40))
 		impale(user)
 		return
 	if((wielded) && prob(50))