From b5a1eff678d6d30f10234758c149ec1eb87cc6b0 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Thu, 16 Jan 2014 20:18:26 -0800 Subject: [PATCH] Add ghost radio Conflicts: code/modules/client/preferences.dm code/world.dm --- code/modules/client/preferences.dm | 5 ++++- code/modules/client/preferences_toggles.dm | 15 ++++++++++++--- code/setup.dm | 1 + code/world.dm | 4 ++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index cc80d0aef50..196a1e7de61 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -266,7 +266,6 @@ datum/preferences dat += "You are banned from using character records.
" else dat += "Character Records
" - dat += "Set Flavor Text
" if(lentext(flavor_text) <= 40) if(!lentext(flavor_text)) @@ -302,6 +301,7 @@ datum/preferences dat += "Randomized Character Slot: [randomslot ? "Yes" : "No"]
" dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]
" dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]
" + dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]
" if(config.allow_Metadata) dat += "OOC Notes: Edit
" @@ -1264,6 +1264,9 @@ datum/preferences if("ghost_sight") toggles ^= CHAT_GHOSTSIGHT + if("ghost_radio") + toggles ^= CHAT_GHOSTRADIO + if("save") save_preferences() save_character() diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index cf0e7f519ed..1ab2d13bf50 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -17,14 +17,23 @@ prefs.save_preferences() feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! +/client/verb/toggle_ghost_radio() + set name = "Enable/Disable GhostRadio" + set category = "Preferences" + set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers" + prefs.toggles ^= CHAT_GHOSTRADIO + src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"]." + prefs.save_preferences() + feedback_add_details("admin_verb","TGR") + /client/proc/toggle_hear_radio() set name = "Show/Hide RadioChatter" set category = "Preferences" - set desc = "Toggle seeing radiochatter from nearby radios and speakers" + set desc = "Toggle seeing radiochatter from radios and speakers" if(!holder) return prefs.toggles ^= CHAT_RADIO prefs.save_preferences() - usr << "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from nearby radios or speakers" + 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/proc/toggleadminhelpsound() @@ -172,4 +181,4 @@ prefs.UI_style_alpha = UI_style_alpha_new prefs.UI_style_color = UI_style_color_new prefs.save_preferences() - usr << "UI was saved" \ No newline at end of file + usr << "UI was saved" diff --git a/code/setup.dm b/code/setup.dm index 8be63f42617..7cbfa43f847 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -649,6 +649,7 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define CHAT_ATTACKLOGS 1024 #define CHAT_DEBUGLOGS 2048 #define CHAT_LOOC 4096 +#define CHAT_GHOSTRADIO 8192 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) diff --git a/code/world.dm b/code/world.dm index a4f2aa00988..b725849763d 100644 --- a/code/world.dm +++ b/code/world.dm @@ -6,8 +6,8 @@ cache_lifespan = 0 //stops player uploaded stuff from being kept in the rsc past the current session +#define RECOMMENDED_VERSION 501 -#define RECOMMENDED_VERSION 495 /world/New() //logs var/date_string = time2text(world.realtime, "YYYY/MM-Month/DD-Day") @@ -19,7 +19,7 @@ diaryofmeanpeople << "\n\nStarting up. [time2text(world.timeofday, "hh:mm.ss")]\n---------------------" if(byond_version < RECOMMENDED_VERSION) - world.log << "Your server's byond version does not meet the recommended requirements for TGstation code. Please update BYOND" + world.log << "Your server's byond version does not meet the recommended requirements for this code. Please update BYOND" if(config && config.log_runtimes) log = file("data/logs/runtime/[time2text(world.realtime,"YYYY-MM-DD-(hh-mm-ss)")]-runtime.log")