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

Fixes emotes being displayed as the wrong type (#19026)

Browse Source 
* Fixes some emote types, fixing the voice analyzer by proxy

* Remove unused utility function
This commit is contained in:
Luc
2022-09-16 12:52:17 -04:00
committed by GitHub
parent b230c76ba8
commit 686cd5fd79
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/emote.dm
+1 -1
View File
@@ -208,7 +208,7 @@
for(var/mob/dead/observer/ghost in viewers(user))
ghost.show_message("<span class=deadsay>[displayed_msg]</span>", EMOTE_VISIBLE)
else if(emote_type & EMOTE_VISIBLE || user.mind?.miming)
else if(emote_type & (EMOTE_AUDIBLE | EMOTE_SOUND) && !user.mind?.miming)
user.audible_message(displayed_msg, deaf_message = "<span class='emote'>You see how <b>[user]</b> [msg]</span>")
else
user.visible_message(displayed_msg, blind_message = "<span class='emote'>You hear how someone [msg]</span>")
code/modules/mob/living/carbon/human/human_emote.dm
+1 -1
View File
@@ -382,7 +382,7 @@
return TRUE
if(prob(5))
user.visible_message("<span class='danger'><b>[user]</b> snaps [p_their()] fingers right off!</span>")
user.visible_message("<span class='danger'><b>[user]</b> snaps [user.p_their()] fingers right off!</span>")
playsound(user.loc, 'sound/effects/snap.ogg', 50, 1)
return TRUE
return ..()