From 59451b0c44e81d58f2e1563677dd4e8a0fc6ded6 Mon Sep 17 00:00:00 2001
From: Luc <89928798+lewcc@users.noreply.github.com>
Date: Fri, 8 Jul 2022 09:57:58 -0700
Subject: [PATCH] Fix users being able to unintentionally emote while fake dead
(#18259)
---
code/datums/emote.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/datums/emote.dm b/code/datums/emote.dm
index 4ae68200ed3..0bd0659af89 100644
--- a/code/datums/emote.dm
+++ b/code/datums/emote.dm
@@ -482,7 +482,7 @@
return FALSE
if(check_mute(user.client?.ckey, MUTE_EMOTE))
- to_chat(src, "You cannot send emotes (muted).")
+ to_chat(user, "You cannot send emotes (muted).")
return FALSE
if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache))
@@ -496,7 +496,7 @@
if(stat)
to_chat(user, "You cannot [key] while [stat]!")
return FALSE
- if(HAS_TRAIT(src, TRAIT_FAKEDEATH))
+ if(HAS_TRAIT(user, TRAIT_FAKEDEATH))
// Don't let people blow their cover by mistake
return FALSE
if(hands_use_check && !user.can_use_hands() && (iscarbon(user)))
@@ -512,14 +512,14 @@
else
// deadchat handling
if(check_mute(user.client?.ckey, MUTE_DEADCHAT))
- to_chat(src, "You cannot send deadchat emotes (muted).")
+ to_chat(user, "You cannot send deadchat emotes (muted).")
return FALSE
if(!(user.client?.prefs.toggles & PREFTOGGLE_CHAT_DEAD))
- to_chat(src, "You have deadchat muted.")
+ to_chat(user, "You have deadchat muted.")
return FALSE
if(!check_rights(R_ADMIN, FALSE, user))
if(!GLOB.dsay_enabled)
- to_chat(src, "Deadchat is globally muted")
+ to_chat(user, "Deadchat is globally muted")
return FALSE
/**