From 76b82e46684eee11490b829cba4847bd248e21e8 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 12 Jul 2020 15:52:55 +0200 Subject: [PATCH] No More As Name Spam (#9101) Speaking with an ID that doesn't match your voice no longer displays (as Unknown) or (as ID name). The addition of the floating chat has largely obsoleted this feature, not that it was that important in the first place. --- code/modules/mob/living/carbon/human/say.dm | 14 ++++---------- html/changelogs/geeves-no_more_uggo_chat.yml | 7 +++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/geeves-no_more_uggo_chat.yml diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 795ae9bf5e4..c796ae6c9d9 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -1,11 +1,3 @@ -/mob/living/carbon/human/say(var/message) - var/alt_name = "" - if(name != GetVoice()) - alt_name = "(as [get_id_name("Unknown")])" - - message = sanitize(message) - ..(message, alt_name = alt_name) - /mob/living/carbon/human/proc/forcesay(list/append) if(stat == CONSCIOUS) if(client) @@ -67,7 +59,6 @@ return ..() /mob/living/carbon/human/GetVoice() - var/voice_sub if(istype(back,/obj/item/rig)) var/obj/item/rig/rig = back @@ -83,7 +74,10 @@ voice_sub = changer.voice if(voice_sub) return voice_sub - if(mind && mind.changeling && mind.changeling.mimicing) + var/obj/item/organ/external/head/face = organs_by_name[BP_HEAD] + if(face?.disfigured) // if your face is ruined, your ability to vocalize is also ruined + return "Unknown" // above ling voice mimicing so they don't get caught out immediately + if(mind?.changeling?.mimicing) return mind.changeling.mimicing if(GetSpecialVoice()) return GetSpecialVoice() diff --git a/html/changelogs/geeves-no_more_uggo_chat.yml b/html/changelogs/geeves-no_more_uggo_chat.yml new file mode 100644 index 00000000000..ef607ab9669 --- /dev/null +++ b/html/changelogs/geeves-no_more_uggo_chat.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - rscdel: "Speaking with an ID that doesn't match your voice no longer displays (as Unknown) or (as ID name)." + - tweak: "Being disfigured makes speech difficult, thus your voice will appear as Unknown." \ No newline at end of file