From a59207aa849a5164e89f900a043f7bbb3caa75ca Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 6 Dec 2017 13:24:14 -0500 Subject: [PATCH] Update say.dm --- code/modules/mob/living/carbon/say.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index a3c8042442..a3ec8896fa 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -36,9 +36,6 @@ if(T) . = T.could_speak_in_language(dt) else -<<<<<<< HEAD - . = initial(dt.flags_1) & TONGUELESS_SPEECH -======= . = initial(dt.flags) & TONGUELESS_SPEECH /mob/living/carbon/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) @@ -48,4 +45,3 @@ var/datum/brain_trauma/trauma = T message = trauma.on_hear(message, speaker, message_language, raw_message, radio_freq) return ..() ->>>>>>> 550d711... Brain Traumas (#31727)