From a51313f66375d54510eb8955a5fa9d7643ee8bdf Mon Sep 17 00:00:00 2001 From: Azzy <74739991+AzzyDreemurr13@users.noreply.github.com> Date: Tue, 9 Jun 2026 23:40:23 +0300 Subject: [PATCH] Talon Channel Fix (#19511) * Update talon_v2.dm * Update maps/offmap_vr/talon/talon_v2.dm * Update maps/offmap_vr/talon/talon_v2.dm * clean that up --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/game/machinery/telecomms/broadcaster.dm | 2 ++ code/game/machinery/telecomms/telecomunications.dm | 9 ++++----- maps/offmap_vr/talon/talon_v2.dm | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index f1a1fa333d7..1966ba93f4f 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -191,7 +191,9 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages if(signal.data["slow"] > 0) addtimer(CALLBACK(src, PROC_REF(broadcast_signal), signal), signal.data["slow"], TIMER_DELETE_ME) + return + broadcast_signal(signal) /obj/machinery/telecomms/allinone/proc/broadcast_signal(datum/signal/signal) /* ###### Broadcast a message using signal.data ###### */ diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 8078ecbb1fc..54dd62a1402 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -112,11 +112,10 @@ /obj/machinery/telecomms/proc/is_freq_listening(datum/signal/signal) // return 1 if found, 0 if not found if(!signal) - return 0 - if((signal.frequency in freq_listening) || (!freq_listening.len)) - return 1 - else - return 0 + return FALSE + if((signal.frequency in freq_listening) || (!length(freq_listening))) + return TRUE + return FALSE /obj/machinery/telecomms/Initialize(mapload) diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 3442a66f8d1..ecedae9edc1 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -141,6 +141,8 @@ /////////////////////////// //// The Various Machines /obj/machinery/telecomms/allinone/talon + id = "talon_aio" + network = "Talon" freq_listening = list(PUB_FREQ, TALON_FREQ) /obj/item/paper/secret_vendornote