From 1817867e993b99f21aab9f1558130fa1bdf13e5b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:37:25 +0100 Subject: [PATCH] [MIRROR] Fixes species/tongue-based speech modification altering sign language [MDB IGNORE] (#24983) * Fixes species/tongue-based speech modification altering sign language (#79685) The second part of [PR standalone, but is better in tandem. This PR seeks to correct Signers from having a species/tongue-based speech modification while signing, i.e. no 'Sss'. Being drunk still affects Signer speech - this is fine for me, * Fixes species/tongue-based speech modification altering sign language --------- Co-authored-by: DBGit42 <149782698+DBGit42@users.noreply.github.com> --- code/modules/surgery/organs/internal/tongue/_tongue.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm index 03b223b4298..46d4647cb1c 100644 --- a/code/modules/surgery/organs/internal/tongue/_tongue.dm +++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm @@ -94,11 +94,18 @@ /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)