Fixes runtime with sound emotes (#22275)

* Check if emote can be ran before checking cooldown

* Minor styling change

* Remove else statement

* Removed duplicate can_run_emote from try_run_emote

---------

Co-authored-by: Adrer <adrermail@gmail.com>
This commit is contained in:
Adrer
2023-09-15 01:33:32 +02:00
committed by GitHub
parent 5c7bb7d89b
commit 1dffbdba56
2 changed files with 3 additions and 3 deletions
-3
View File
@@ -237,9 +237,6 @@
* Returns TRUE if the emote was able to be run (or failed successfully), or FALSE if the emote is unusable.
*/
/datum/emote/proc/try_run_emote(mob/user, params, type_override, intentional = FALSE)
if(!can_run_emote(user, intentional = intentional))
return FALSE
// You can use this signal to block execution of emotes from components/other sources.
var/sig_res = SEND_SIGNAL(user, COMSIG_MOB_PREEMOTE, key, intentional)
switch(sig_res)