diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 0ebad2a8b53..94db88f2bcf 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -249,7 +249,7 @@
/datum/quirk/tongue_tied
name = "Tongue Tied"
desc = "Due to a past incident, your ability to communicate has been relegated to your hands."
- value = 1
+ value = 0
medical_record_text = "During physical examination, patient's tongue was found to be uniquely damaged."
//Adds tongue & gloves
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index f28089272ef..935d97fb032 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -347,22 +347,23 @@
REMOVE_TRAIT(M, TRAIT_SIGN_LANG, "tongue") //People who are Ahealed get "cured" of their sign language-having ways. If I knew how to make the tied tongue persist through aheals, I'd do that.
//Thank you Jwapplephobia for helping me with the literal hellcode below
+
/obj/item/organ/tongue/tied/handle_speech(datum/source, list/speech_args)
var/new_message
var/message = speech_args[SPEECH_MESSAGE]
- var/exclamation_used = FALSE
- var/question_mark_used = FALSE
var/mob/living/carbon/M = owner
- for(var/i in 1 to length(message))
- if(findtext("!", message[i]))
- exclamation_used = TRUE
- else if (findtext("?", message[i]))
- question_mark_used = TRUE
+ new_message = message
+ if(findtext(message, "!"))
+ if(!findtext(message, "?"))
+ M.visible_message("[M] raises [M.p_their()] eyebrows.")
else
- new_message += message[i]
- if(exclamation_used)
- M.visible_message("[M] raises [M.p_their()] eyebrows.")
- if(question_mark_used)
- M.visible_message("[M] lowers [M.p_their()] eyebrows.")
+ M.visible_message("[M] lowers one of [M.p_their()] eyebrows, raising the other.")
+ new_message = replacetext(new_message, "!", "")
+
+ if(findtext(message, "?"))
+ if(!findtext(message, "!"))
+ M.visible_message("[M] lowers [M.p_their()] eyebrows.")
+ new_message = replacetext(new_message, "?", "")
speech_args[SPEECH_MESSAGE] = new_message
+