From e91d4add00b0ad756d2b987670208e4f4b5ae0fc Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 2 Feb 2020 19:52:28 -0300 Subject: [PATCH] Revert "Adds a Hide/Show AOOC verb. (#8119)" (#8170) This reverts commit 65c39895f365662c9994fdebfe77f2bafa775915. --- code/__defines/misc.dm | 3 +-- code/modules/admin/admin_verbs.dm | 21 +++------------------ code/modules/admin/verbs/antag-ooc.dm | 4 ---- code/modules/client/preferences_toggles.dm | 6 ++++-- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 56629989b3d..3e2edeb6716 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -53,14 +53,13 @@ #define CHAT_GHOSTRADIO 0x2000 #define SHOW_TYPING 0x4000 #define CHAT_NOICONS 0x8000 -#define CHAT_AOOC 0x10000 #define PARALLAX_SPACE 0x1 #define PARALLAX_DUST 0x2 #define PROGRESS_BARS 0x4 #define PARALLAX_IS_STATIC 0x8 -#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|CHAT_AOOC) +#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) //Sound effects toggles #define ASFX_AMBIENCE 1 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d14136e5491..717b37a6291 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -98,8 +98,7 @@ var/list/admin_verbs_admin = list( /client/proc/clear_toxins, /client/proc/wipe_ai, // allow admins to force-wipe AIs /client/proc/fix_player_list, - /client/proc/reset_openturf, - /client/proc/listen_aooc + /client/proc/reset_openturf ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -343,8 +342,7 @@ var/list/admin_verbs_mod = list( /client/proc/check_words, /*displays cult-words*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ /client/proc/aooc, - /client/proc/print_logout_report, - /client/proc/listen_aooc + /client/proc/print_logout_report ) var/list/admin_verbs_dev = list( //will need to be altered - Ryan784 @@ -392,8 +390,7 @@ var/list/admin_verbs_cciaa = list( /datum/admins/proc/create_admin_fax, /client/proc/check_fax_history, /client/proc/aooc, - /client/proc/check_antagonists, - /client/proc/listen_aooc + /client/proc/check_antagonists ) /client/proc/add_admin_verbs() @@ -784,18 +781,6 @@ var/list/admin_verbs_cciaa = list( to_chat(src, "You now have the keys to control the planet, or atleast a small space station") verbs -= /client/proc/readmin_self -/client/proc/listen_aooc() - set name = "Show/Hide AOOC" - set category = "Preferences" - - if(!check_rights(R_ADMIN|R_MOD|R_CCIAA)) - return - prefs.toggles ^= CHAT_AOOC - if (prefs.toggles & CHAT_AOOC) - to_chat(usr, "You now will see all messages in AOOC.") - else - to_chat(usr, "You now won't see messages in aooc") - /client/proc/deadmin_self() set name = "De-admin self" set category = "Admin" diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index 8acad2ec765..9350bbbedc2 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -14,10 +14,6 @@ if(!msg) return - if(!(prefs.toggles & CHAT_AOOC)) - to_chat(src, "You have AOOC muted.") - return - var/display_name = src.key if (holder) display_name = "[display_name]([holder.rank])" diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 85ab6dc0837..0fffff8d743 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -110,6 +110,7 @@ to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/verb/listen_looc() set name = "Show/Hide LOOC" set category = "Preferences" @@ -119,7 +120,8 @@ to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - + + /client/verb/toggle_chattags() set name = "Show/Hide Chat Tags" set category = "Preferences" @@ -212,4 +214,4 @@ if (prefs.toggles_secondary & PARALLAX_IS_STATIC) to_chat(src, "Space will no longer move.") else - to_chat(src, "Space will now move.") + to_chat(src, "Space will now move.") \ No newline at end of file