From 9296564ab65759f25a9c4221d4db8e18a6ef80b2 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu, 23 May 2024 05:48:43 +0200 Subject: [PATCH] Fixes various radio issues (#25586) * Fixes various radio issues * Steel review --- code/game/machinery/tcomms/tcomms_base.dm | 2 +- code/modules/client/preference/preferences.dm | 2 +- code/modules/client/preference/preferences_toggles.dm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/tcomms/tcomms_base.dm b/code/game/machinery/tcomms/tcomms_base.dm index f89810dd4d8..c9507b67636 100644 --- a/code/game/machinery/tcomms/tcomms_base.dm +++ b/code/game/machinery/tcomms/tcomms_base.dm @@ -280,7 +280,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) bad_connection = is_bad_connection(tcm.connection.frequency, display_freq) new_connection = SSradio.return_frequency(display_freq) - var/list/radios = list() + var/list/radios = list(GLOB.deadchat_radio) // --- Broadcast only to intercom devices --- diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index bb2816be556..e627e2d4d3b 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -410,7 +410,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += "Donator Publicity: [(toggles & PREFTOGGLE_DONATOR_PUBLIC) ? "Public" : "Hidden"]
" dat += "FPS: [clientfps]
" dat += "Ghost Ears: [(toggles & PREFTOGGLE_CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]
" - dat += "Ghost Radio: [(toggles & PREFTOGGLE_CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]
" + dat += "Ghost Radio: [(toggles & PREFTOGGLE_CHAT_GHOSTRADIO) ? "All Chatter" : "No Chatter"]
" dat += "Ghost Sight: [(toggles & PREFTOGGLE_CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]
" dat += "Ghost PDA: [(toggles & PREFTOGGLE_CHAT_GHOSTPDA) ? "All PDA Messages" : "No PDA Messages"]
" if(check_rights(R_ADMIN,0)) diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index de74fbec1d1..c90cec523f0 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -65,12 +65,12 @@ /datum/preference_toggle/toggle_ghost_radio name = "Toggle Ghost Radio" - description = "Toggle between hearing all radio chatter, or only from nearby speakers" + description = "Toggle between hearing all radio chatter, or only from nobody" preftoggle_bitflag = PREFTOGGLE_CHAT_GHOSTRADIO preftoggle_toggle = PREFTOGGLE_TOGGLE1 preftoggle_category = PREFTOGGLE_CATEGORY_GHOST - enable_message = "As a ghost, you will now only hear from nearby speakers." - disable_message = "As a ghost, you will now hear all radio chat in the world." + enable_message = "As a ghost, you will now hear all radio chat in the world." + disable_message = "As a ghost, you will now hear no radio chat." blackbox_message = "Toggle GhostRadio" /datum/preference_toggle/toggle_ghost_radio/set_toggles(client/user)