From eb9f48fdd56ff5a85ff6f59219fcf0530fb78ce5 Mon Sep 17 00:00:00 2001 From: Bop Date: Sun, 22 Dec 2024 01:05:35 +0700 Subject: [PATCH 1/3] unga --- code/modules/mob/living/say.dm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index ce518c162584..944f8945a50c 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -385,13 +385,22 @@ GLOBAL_LIST_INIT(special_radio_keys, list( /mob/living/proc/radio(message, list/message_mods = list(), list/spans, language) var/obj/item/implant/radio/imp = locate() in src + var/obj/item/radio/radio = get_item_by_slot(ITEM_SLOT_EARS) if(imp && imp.radio.on) if(message_mods[MODE_HEADSET]) - imp.radio.talk_into(src, message, null, spans, language, message_mods) - return ITALICS | REDUCE_RANGE + if(radio?.use_command) + radio.radio.talk_into(src, message, null, spans, language, message_mods) + return ITALICS | REDUCE_RANGE + else + imp.radio.talk_into(src, message, null, spans, language, message_mods) + return ITALICS | REDUCE_RANGE if(message_mods[RADIO_EXTENSION] == MODE_DEPARTMENT || (message_mods[RADIO_EXTENSION] in imp.radio.channels)) - imp.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) - return ITALICS | REDUCE_RANGE + if(radio?.use_command) + radio.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) + return ITALICS | REDUCE_RANGE + else + imp.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) + return ITALICS | REDUCE_RANGE switch(message_mods[RADIO_EXTENSION]) if(MODE_RADIO) From b331d38d9072f068880703906c4bed3e93b76dfb Mon Sep 17 00:00:00 2001 From: Bop Date: Sun, 22 Dec 2024 01:07:48 +0700 Subject: [PATCH 2/3] oops --- code/modules/mob/living/say.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 944f8945a50c..7b1051b75835 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -389,18 +389,16 @@ GLOBAL_LIST_INIT(special_radio_keys, list( if(imp && imp.radio.on) if(message_mods[MODE_HEADSET]) if(radio?.use_command) - radio.radio.talk_into(src, message, null, spans, language, message_mods) - return ITALICS | REDUCE_RANGE + radio.talk_into(src, message, null, spans, language, message_mods) else imp.radio.talk_into(src, message, null, spans, language, message_mods) - return ITALICS | REDUCE_RANGE + return ITALICS | REDUCE_RANGE if(message_mods[RADIO_EXTENSION] == MODE_DEPARTMENT || (message_mods[RADIO_EXTENSION] in imp.radio.channels)) if(radio?.use_command) - radio.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) - return ITALICS | REDUCE_RANGE + radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) else imp.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) - return ITALICS | REDUCE_RANGE + return ITALICS | REDUCE_RANGE switch(message_mods[RADIO_EXTENSION]) if(MODE_RADIO) From e3a2529827a6b798a499d1b29247ce681295311e Mon Sep 17 00:00:00 2001 From: Bop Date: Sun, 22 Dec 2024 01:22:51 +0700 Subject: [PATCH 3/3] better fix --- code/modules/mob/living/say.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 7b1051b75835..a8eb6006dfe0 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -387,17 +387,13 @@ GLOBAL_LIST_INIT(special_radio_keys, list( var/obj/item/implant/radio/imp = locate() in src var/obj/item/radio/radio = get_item_by_slot(ITEM_SLOT_EARS) if(imp && imp.radio.on) + if(radio?.use_command) + spans |= SPAN_COMMAND if(message_mods[MODE_HEADSET]) - if(radio?.use_command) - radio.talk_into(src, message, null, spans, language, message_mods) - else - imp.radio.talk_into(src, message, null, spans, language, message_mods) + imp.radio.talk_into(src, message, null, spans, language, message_mods) return ITALICS | REDUCE_RANGE if(message_mods[RADIO_EXTENSION] == MODE_DEPARTMENT || (message_mods[RADIO_EXTENSION] in imp.radio.channels)) - if(radio?.use_command) - radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) - else - imp.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) + imp.radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods) return ITALICS | REDUCE_RANGE switch(message_mods[RADIO_EXTENSION])