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
@@ -68,7 +68,11 @@
 							return

 /datum/brain_trauma/mild/phobia/on_hear(message, speaker, message_language, raw_message, radio_freq)
+<<<<<<< HEAD
 	if(owner.disabilities & DEAF || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
+=======
+	if(owner.has_disability(DISABILITY_DEAF) || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return message
 	for(var/word in trigger_words)
 		if(findtext(message, word))