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

Runechats emotes with sound effects. (#23255)

Browse Source 
* Remove emote_sound from the codebase

* quick cleanups

* Update code/datums/emote.dm

oops

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* gnarg

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Luc
2023-11-29 13:18:20 -05:00
committed by GitHub
parent 7ff488fd22
commit 2d6545a291
9 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/emote.dm
+3 -3
View File
@@ -182,7 +182,7 @@
var/suppressed = FALSE
// Keep em quiet if they can't speak
if(!can_vocalize_emotes(user) && (emote_type & (EMOTE_MOUTH | EMOTE_AUDIBLE) || emote_type & (EMOTE_MOUTH | EMOTE_SOUND)))
if(!can_vocalize_emotes(user) && (emote_type & (EMOTE_MOUTH | EMOTE_AUDIBLE)))
var/noise_emitted = pick(muzzled_noises)
suppressed = TRUE
msg = "makes \a [noise_emitted] noise."
@@ -215,12 +215,12 @@
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_AUDIBLE | EMOTE_SOUND) && !user.mind?.miming)
else if((emote_type & EMOTE_AUDIBLE) && !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>")
if(!(emote_type & (EMOTE_FORCE_NO_RUNECHAT | EMOTE_SOUND) || suppressed) && !isobserver(user))
if(!((emote_type & EMOTE_FORCE_NO_RUNECHAT) || suppressed) && !isobserver(user))
runechat_emote(user, msg)
SEND_SIGNAL(user, COMSIG_MOB_EMOTED(key), src, key, emote_type, message, intentional)