Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

2019-07-03 02:36:23 +02:00
parent d9d4a88a0b d01eb661cd
commit c58efa64c1
748 changed files with 20974 additions and 13981 deletions
@@ -192,7 +192,7 @@
 	return //no random switching

 /datum/brain_trauma/severe/split_personality/brainwashing/on_hear(message, speaker, message_language, raw_message, radio_freq)
-	if(owner.has_trait(TRAIT_DEAF) || owner == speaker)
+	if(HAS_TRAIT(owner, TRAIT_DEAF) || owner == speaker)
 		return message
 	if(findtext(message, codeword))
 		message = replacetext(message, codeword, "<span class='warning'>[codeword]</span>")