cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix users being able to unintentionally emote while fake dead (#18259)

Browse Source
This commit is contained in:
Luc
2022-07-08 09:57:58 -07:00
committed by GitHub
parent 570c1b2f73
commit 59451b0c44
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/emote.dm
+5 -5
View File
@@ -482,7 +482,7 @@
return FALSE
if(check_mute(user.client?.ckey, MUTE_EMOTE))
to_chat(src, "<span class='warning'>You cannot send emotes (muted).</span>")
to_chat(user, "<span class='warning'>You cannot send emotes (muted).</span>")
return FALSE
if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache))
@@ -496,7 +496,7 @@
if(stat)
to_chat(user, "<span class='warning'>You cannot [key] while [stat]!</span>")
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, "<span class='warning'>You cannot send deadchat emotes (muted).</span>")
to_chat(user, "<span class='warning'>You cannot send deadchat emotes (muted).</span>")
return FALSE
if(!(user.client?.prefs.toggles & PREFTOGGLE_CHAT_DEAD))
to_chat(src, "<span class='warning'>You have deadchat muted.</span>")
to_chat(user, "<span class='warning'>You have deadchat muted.</span>")
return FALSE
if(!check_rights(R_ADMIN, FALSE, user))
if(!GLOB.dsay_enabled)
to_chat(src, "<span class='warning'>Deadchat is globally muted</span>")
to_chat(user, "<span class='warning'>Deadchat is globally muted</span>")
return FALSE
/**