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
@@ -99,7 +99,7 @@
 		return ..()

 	add_fingerprint(user)
-	if((user.has_disability(CLUMSY)) && prob(50))
+	if((user.has_disability(DISABILITY_CLUMSY)) && prob(50))
 		to_chat(user, "<span class ='danger'>You club yourself over the head.</span>")
 		user.Knockdown(60 * force)
 		if(ishuman(user))