From 8fc1cc302405dbd24025723edc21f73da4c132cd Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 24 Jul 2014 16:35:22 -0400 Subject: [PATCH] Remove RadioChatter toggle as redundant and broken. Ghosts can use GhostRadio toggle while players can turn off their headsets ICly. --- code/game/machinery/telecomms/broadcaster.dm | 6 +----- code/game/objects/items/devices/radio/radio.dm | 4 +--- code/modules/client/preferences_toggles.dm | 9 --------- code/setup.dm | 4 ++-- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 68c09e7fad3..633f1bdefbe 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -283,12 +283,10 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Loop through the receivers and categorize them --- */ - if (R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. - continue if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. continue - + // Ghosts hearing all radio chat don't want to hear syndicate intercepts, they're duplicates if(data == 3 && istype(R, /mob/dead/observer) && R.client && (R.client.prefs.toggles & CHAT_GHOSTRADIO)) continue @@ -617,8 +615,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Loop through the receivers and categorize them --- */ - if (R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. - continue // --- Check for compression --- diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index fcd7d2c76fe..81a24644715 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -479,8 +479,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use var/list/heard_garbled = list() // garbled message for (var/mob/R in receive) - if (R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. - continue if (R.say_understands(M)) if (ishuman(M) && M.GetVoice() != M.real_name) heard_masked += R @@ -824,4 +822,4 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc R.radio = null - ..() + ..() diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 95b40bb0992..a9b9d9aad9c 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -26,15 +26,6 @@ prefs.save_preferences(src) feedback_add_details("admin_verb","TGR") -/client/verb/toggle_hear_radio() - set name = "Show/Hide RadioChatter" - set category = "Preferences" - set desc = "Toggle seeing radiochatter from radios and speakers" - prefs.toggles ^= CHAT_RADIO - prefs.save_preferences(src) - usr << "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers" - feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /client/verb/toggleadminhelpsound() set name = "Hear/Silence Adminhelps" set category = "Preferences" diff --git a/code/setup.dm b/code/setup.dm index 0c93f8ceed3..d47d1da34d9 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -689,7 +689,7 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define CHAT_GHOSTEARS 4 #define CHAT_GHOSTSIGHT 8 #define CHAT_PRAYER 16 -#define CHAT_RADIO 32 +//#define CHAT_RADIO 32 #define CHAT_ATTACKLOGS 64 #define CHAT_DEBUGLOGS 128 #define CHAT_LOOC 256 @@ -702,7 +702,7 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define SOUND_STREAMING 16 #define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_STREAMING) -#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) +#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_ATTACKLOGS|CHAT_LOOC) #define BE_TRAITOR 1 #define BE_OPERATIVE 2