save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00
parent 164db7ae9b c84a8cc9e1
commit 2e6b034493
39 changed files with 11 additions and 588 deletions
@@ -68,11 +68,7 @@
 							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))