diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index cbbeab71ad..c7f6745c43 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -8,7 +8,7 @@ var/list/admin_verbs_default = list( /client/proc/cmd_mod_say, //VOREStation Add, /client/proc/cmd_event_say, //VOREStation Add, /client/proc/cmd_mentor_ticket_panel, - /client/proc/cmd_mentor_say + /client/proc/cmd_mentor_say, // /client/proc/hide_verbs, //hides all our adminverbs, //VOREStation Remove, // /client/proc/hide_most_verbs, //hides all our hideable adminverbs, //VOREStation Remove, // /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify, //VOREStation Remove, @@ -18,6 +18,8 @@ var/list/admin_verbs_default = list( // /client/proc/cmd_mod_say, // /client/proc/deadchat //toggles deadchat on/off, // /client/proc/toggle_ahelp_sound, + /client/proc/toggle_admin_global_looc, + /client/proc/toggle_admin_deadchat ) var/list/admin_verbs_admin = list( diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index 11ef5d994b..f7ca6bf963 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -422,3 +422,9 @@ var/list/_client_preferences_by_type key = "CHAT_RLOOC" enabled_description = "Show" disabled_description = "Hide" + +/datum/client_preference/holder/show_staff_dsay + description ="Staff Deadchat" + key = "CHAT_ADSAY" + enabled_description = "Show" + disabled_description = "Hide" diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index 6df855d1eb..0e83638e88 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -512,7 +512,7 @@ CHOMPRemove. Bundled voice sounds into emote/whisper/subtle. Going this extra le to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] receive debug logs.") SScharacter_setup.queue_preferences_save(prefs) - feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + feedback_add_details("admin_verb","TADebugLogs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //Mods /client/proc/toggle_attack_logs() @@ -527,4 +527,33 @@ CHOMPRemove. Bundled voice sounds into emote/whisper/subtle. Going this extra le to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] receive attack logs.") SScharacter_setup.queue_preferences_save(prefs) - feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + feedback_add_details("admin_verb","TAAttackLogs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +//General +/client/proc/toggle_admin_global_looc() + set name = "Toggle Admin Global LOOC Visibility" + set category = "Preferences" + set desc = "Toggles seeing LOOC messages outside your actual LOOC range." + + var/pref_path = /datum/client_preference/holder/show_rlooc + + if(holder) + toggle_preference(pref_path) + to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear global LOOC.") + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb","TAGlobalLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/proc/toggle_admin_deadchat() + set name = "Toggle Admin Living Deadchat" + set category = "Preferences" + set desc = "Toggles seeing deadchat while not observing." + + var/pref_path = /datum/client_preference/holder/show_staff_dsay + + if(holder) + toggle_preference(pref_path) + to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear deadchat while not observing.") + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb","TADeadchat") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index c36a48f13f..0a4e270ed6 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -408,7 +408,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) return // Can't talk in deadchat if you can't see it. for(var/mob/M in player_list) - if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && M.client.holder.rights)) && M.is_preference_enabled(/datum/client_preference/show_dsay)) + if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && M.client.holder.rights && M.is_preference_enabled(/datum/client_preference/holder/show_staff_dsay))) && M.is_preference_enabled(/datum/client_preference/show_dsay)) var/follow var/lname if(M.forbid_seeing_deadchat && !M.client.holder) @@ -438,7 +438,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) /proc/say_dead_object(var/message, var/obj/subject = null) for(var/mob/M in player_list) - if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && M.client.holder.rights)) && M.is_preference_enabled(/datum/client_preference/show_dsay)) + if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && M.client.holder.rights && M.is_preference_enabled(/datum/client_preference/holder/show_staff_dsay))) && M.is_preference_enabled(/datum/client_preference/show_dsay)) var/follow var/lname = "Game Master" if(M.forbid_seeing_deadchat && !M.client.holder)