From ec23688578e0537c5813b64bedafb4898abed5d0 Mon Sep 17 00:00:00 2001 From: ReezeBL Date: Tue, 14 Nov 2023 10:57:15 +0300 Subject: [PATCH] mc resolve --- code/modules/surgery/organs/internal/tongue/_tongue.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm index 46d4647cb1c..3d3d7240bb9 100644 --- a/code/modules/surgery/organs/internal/tongue/_tongue.dm +++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm @@ -94,18 +94,15 @@ /obj/item/organ/internal/tongue/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER -<<<<<<< HEAD if(speech_args[SPEECH_LANGUAGE] in languages_native) return FALSE //no changes // FF add, for auto-accent if(HAS_TRAIT(source, TRAIT_NO_ACCENT)) return FALSE //accent disabled by user. -======= if(speech_args[SPEECH_LANGUAGE] in languages_native) // Speaking a native language? return FALSE // Don't modify speech if(HAS_TRAIT(source, TRAIT_SIGN_LANG)) // No modifiers for signers - I hate this but I simply cannot get these to combine into one statement return FALSE // Don't modify speech ->>>>>>> c0d618e65 ([MIRROR] Fixes species/tongue-based speech modification altering sign language [MDB IGNORE] (#24983)) modify_speech(source, speech_args) /obj/item/organ/internal/tongue/proc/modify_speech(datum/source, list/speech_args)