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
@@ -202,7 +202,11 @@
 	if(!user.mind.hasSoul)
 		to_chat(user, "<span class='notice'>You do not possess a soul.</span>")
 		return 0
+<<<<<<< HEAD
 	if(user.disabilities & DUMB)
+=======
+	if(user.has_disability(DISABILITY_DUMB))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='notice'>You quickly scrawl 'your name' on the contract.</span>")
 		signIncorrectly()
 		return 0