From 65c39895f365662c9994fdebfe77f2bafa775915 Mon Sep 17 00:00:00 2001
From: Yonnimer <31339047+Yonnimer@users.noreply.github.com>
Date: Sat, 1 Feb 2020 18:15:20 -0500
Subject: [PATCH] Adds a Hide/Show AOOC verb. (#8119)
---
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 ++--
html/changelogs/Yonnimer-ToggleAOOC.yml | 41 ++++++++++++++++++++++
5 files changed, 67 insertions(+), 8 deletions(-)
create mode 100644 html/changelogs/Yonnimer-ToggleAOOC.yml
diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
index 3e2edeb6716..56629989b3d 100644
--- a/code/__defines/misc.dm
+++ b/code/__defines/misc.dm
@@ -53,13 +53,14 @@
#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)
+#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)
//Sound effects toggles
#define ASFX_AMBIENCE 1
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 717b37a6291..d14136e5491 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -98,7 +98,8 @@ 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/reset_openturf,
+ /client/proc/listen_aooc
)
var/list/admin_verbs_ban = list(
/client/proc/unban_panel,
@@ -342,7 +343,8 @@ 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/print_logout_report,
+ /client/proc/listen_aooc
)
var/list/admin_verbs_dev = list( //will need to be altered - Ryan784
@@ -390,7 +392,8 @@ 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/check_antagonists,
+ /client/proc/listen_aooc
)
/client/proc/add_admin_verbs()
@@ -781,6 +784,18 @@ 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 9350bbbedc2..8acad2ec765 100644
--- a/code/modules/admin/verbs/antag-ooc.dm
+++ b/code/modules/admin/verbs/antag-ooc.dm
@@ -14,6 +14,10 @@
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 0fffff8d743..85ab6dc0837 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -110,7 +110,6 @@
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"
@@ -120,8 +119,7 @@
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"
@@ -214,4 +212,4 @@
if (prefs.toggles_secondary & PARALLAX_IS_STATIC)
to_chat(src, "Space will no longer move.")
else
- to_chat(src, "Space will now move.")
\ No newline at end of file
+ to_chat(src, "Space will now move.")
diff --git a/html/changelogs/Yonnimer-ToggleAOOC.yml b/html/changelogs/Yonnimer-ToggleAOOC.yml
new file mode 100644
index 00000000000..8290d8d58d7
--- /dev/null
+++ b/html/changelogs/Yonnimer-ToggleAOOC.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Yonnimer
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Adds a Toggle-AOOC verb"