From fd87b9fafdcf064e4db5f4a4079bb8237eb9190a Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Fri, 18 Mar 2022 06:41:58 +1000
Subject: [PATCH] Makes PSay and PMe obey Ghost Privacy pref

---
 code/modules/mob/say_vr.dm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 59f4f47825f..e4ffaec1e66 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -126,7 +126,7 @@
 		message = input(usr, "Type a message to say.","Psay") as text|null
 	message = sanitize_or_reflect(message,src)
 	if (!message)
-		return	
+		return
 	message = capitalize(message)
 	if (stat == DEAD)
 		return say_dead(message)
@@ -150,7 +150,7 @@
 		pb = M.loc.loc
 		to_chat(pb, "<span class='changeling'>\The [M] thinks, \"[message]\"</span>")	//To our pred if absorbed
 		f = TRUE
-	
+
 	if(pb)	//We are prey, let's do the prey thing.
 
 		for(var/I in pb.contents)
@@ -185,6 +185,8 @@
 			if (istype(G, /mob/new_player))
 				continue
 			else if(G.stat == DEAD && G.is_preference_enabled(/datum/client_preference/ghost_ears))
+				if(!(src.is_preference_enabled(/datum/client_preference/whisubtle_vis)) && isobserver(G))
+					continue
 				to_chat(G, "<span class='changeling'>\The [M] thinks, \"[message]\"</span>")
 		log_say(message,M)
 	else		//There wasn't anyone to send the message to, pred or prey, so let's just say it instead and correct our psay just in case.
@@ -206,7 +208,7 @@
 		message = input(usr, "Type a message to emote.","Pme") as text|null
 	message = sanitize_or_reflect(message,src)
 	if (!message)
-		return	
+		return
 	if (stat == DEAD)
 		return say_dead(message)
 	if(!isliving(src))
@@ -230,7 +232,7 @@
 		pb = M.loc.loc
 		to_chat(pb, "<span class='changeling'>\The [M] [message]</span>")	//To our pred if absorbed
 		f = TRUE
-	
+
 	if(pb)	//We are prey, let's do the prey thing.
 
 		for(var/I in pb.contents)
@@ -264,7 +266,9 @@
 		for (var/mob/G in player_list)
 			if (istype(G, /mob/new_player))
 				continue
-			else if(G.stat == DEAD && G.is_preference_enabled(/datum/client_preference/ghost_ears))
+			else if(G.stat == DEAD && G.is_preference_enabled(/datum/client_preference/ghost_sight))
+				if(!(src.is_preference_enabled(/datum/client_preference/whisubtle_vis)) && isobserver(G))
+					continue
 				to_chat(G, "<span class='changeling'>\The [M] [message]</span>")
 		log_say(message,M)
 	else	//There wasn't anyone to send the message to, pred or prey, so let's just emote it instead and correct our psay just in case.