cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12448 from Heroman3003/privacyforpred

Browse Source 
Makes PSay and PMe obey Ghost Privacy pref
This commit is contained in:
Casey
2022-03-18 15:33:01 -04:00
committed by GitHub
parent 303911c9d1 fd87b9fafd
commit 69a2279dcd
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/say_vr.dm
+9 -5
View File
@@ -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.