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
@@ -192,11 +192,7 @@
 	return //no random switching

 /datum/brain_trauma/severe/split_personality/brainwashing/on_hear(message, speaker, message_language, raw_message, radio_freq)
-<<<<<<< HEAD
-	if(owner.disabilities & DEAF || owner == speaker)
-=======
 	if(owner.has_disability(DISABILITY_DEAF) || owner == speaker)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return message
 	if(findtext(message, codeword))
 		message = replacetext(message, codeword, "<span class='warning'>[codeword]</span>")