From c97dfe991f70c30217c4d44979522d6af4eb66b8 Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 12 Aug 2026 23:25:21 +0000 Subject: [PATCH] Fix skipping language keys in favor of partial radio keys. (#32353) * Fix skipping language keys in favor of partial radio keys. * Give drone language a functional key. * Remove admin message. --- code/modules/mob/language.dm | 2 +- code/modules/mob/mob_say_base.dm | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index ce394112505..f8605421ecf 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -673,7 +673,7 @@ speech_verb = "states" ask_verb = "queries" exclaim_verbs = list("declares") - key = "]" + key = "|" flags = RESTRICTED | NOLIBRARIAN follow = TRUE syllables = list ("beep", "boop") diff --git a/code/modules/mob/mob_say_base.dm b/code/modules/mob/mob_say_base.dm index 20f6900edef..5cd9c03ecd8 100644 --- a/code/modules/mob/mob_say_base.dm +++ b/code/modules/mob/mob_say_base.dm @@ -142,7 +142,10 @@ return standard_mode if(length(message) >= 2) - var/channel_prefix = copytext_char(message, 1, 3) + var/channel_prefix = trim_right(copytext_char(message, 1, 4)) + var/datum/language/L = GLOB.language_keys[channel_prefix] + if(L != null && can_speak_language(L)) + return null // Deconflict your language/radio keys if this causes problems. return GLOB.department_radio_keys[channel_prefix] return null