From f7609c6afffd2ec1ac3f0eaf1b2cf7881831fa70 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Fri, 17 Apr 2020 17:43:07 -0400
Subject: [PATCH] Makes it a preference

---
 .../preference_setup/global/setting_datums.dm  |  6 ++++++
 code/modules/client/preferences_vr.dm          | 18 ++++++++++++++++--
 code/modules/mob/living/say.dm                 |  2 +-
 code/modules/mob/say_vr.dm                     |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm
index 8fefa8c929..1703d582a2 100644
--- a/code/modules/client/preference_setup/global/setting_datums.dm
+++ b/code/modules/client/preference_setup/global/setting_datums.dm
@@ -104,6 +104,12 @@ var/list/_client_preferences_by_type
 	key = "EMOTE_NOISES"
 	enabled_description = "Noisy"
 	disabled_description = "Silent"
+/datum/client_preference/whisubtle_vis
+	description = "Whi/Subtles Ghost Visible" 
+	key = "WHISUBTLE_VIS"
+	enabled_description = "Visible"
+	disabled_description = "Hidden"
+	enabled_by_default = FALSE
 //VOREStation Add End
 /datum/client_preference/weather_sounds
 	description ="Weather sounds"
diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm
index ae7801b30c..7d90e451b6 100644
--- a/code/modules/client/preferences_vr.dm
+++ b/code/modules/client/preferences_vr.dm
@@ -1,5 +1,4 @@
-//TFF 5/8/19 - minor refactoring of this thing from 09_misc.dm to call this for preferences.
-datum/preferences
+/datum/preferences
 	var/show_in_directory = 1	//Show in Character Directory
 	var/sensorpref = 5			//Set character's suit sensor level
 
@@ -54,3 +53,18 @@ datum/preferences
 	SScharacter_setup.queue_preferences_save(prefs)
 
 	feedback_add_details("admin_verb","TEmoteNoise") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_quiets()
+	set name = "Whisper/Subtle Vis"
+	set category = "Preferences"
+	set desc = "Toggle ghosts viewing your subtles/whispers."
+
+	var/pref_path = /datum/client_preference/whisubtle_vis
+
+	toggle_preference(pref_path)
+
+	to_chat(src, "Ghosts will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear subtles/whispers made by you.")
+
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	feedback_add_details("admin_verb","TWhisubtleVis") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 27efccce71..f980601d39 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -364,7 +364,7 @@ proc/get_radio_key_from_channel(var/channel)
 
 			if(M && src) //If we still exist, when the spawn processes
 				//VOREStation Add - Ghosts don't hear whispers
-				if(whispering && isobserver(M) && !M.client?.holder)
+				if(whispering && !is_preference_enabled(/datum/client_preference/whisubtle_vis) && isobserver(M) && !M.client?.holder)
 					M.show_message("<span class='game say'><span class='name'>[src.name]</span> [w_not_heard].</span>", 2)
 					return
 				//VOREStation Add End
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 5543f48e2e..bd81c9b347 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -51,7 +51,7 @@
 
 		for(var/vismob in vis_mobs)
 			var/mob/M = vismob
-			if(isobserver(M) && !M.client?.holder)
+			if(isobserver(M) && !is_preference_enabled(/datum/client_preference/whisubtle_vis) && !M.client?.holder)
 				spawn(0)
 					M.show_message(undisplayed_message, 2)
 			else