cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix radio keys without spaces before message. (#32425)

Browse Source
This commit is contained in:
Alan
2026-08-14 00:17:29 +00:00
committed by GitHub
parent f6b562e6b6
commit b0c7497fce
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/parrot.dm
+6 -4
View File
@@ -247,10 +247,12 @@
available_channels.Add(":n")
if("Medical")
available_channels.Add(":m")
if("Mining")
available_channels.Add(":d")
if("Cargo")
available_channels.Add(":q")
if("Supply")
available_channels.Add(":u")
if("Service")
available_channels.Add(":z")
if("Procedure")
available_channels.Add(":x")
if(ears.translate_binary)
available_channels.Add(":b")
code/modules/mob/mob_say_base.dm
+17 -4
View File
@@ -142,11 +142,24 @@
return standard_mode
if(length(message) >= 2)
var/channel_prefix = trim_right(copytext_char(message, 1, 4))
var/datum/language/L = GLOB.language_keys[channel_prefix]
var/channel_prefix_long = trim_right(copytext_char(message, 1, 4))
var/channel_prefix_short = trim_right(copytext_char(message, 1, 3))
// Check languages first. Deconflict your language/radio keys if this causes problems.
var/datum/language/L = GLOB.language_keys[channel_prefix_long]
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
L = GLOB.language_keys[channel_prefix_short]
if(L != null && can_speak_language(L))
return null
// Now check radio keys.
var/radio_key = GLOB.department_radio_keys[channel_prefix_long]
if(radio_key != null)
return radio_key
radio_key = GLOB.department_radio_keys[channel_prefix_short]
if(radio_key != null)
return radio_key
return null