diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index ed29eea88bc..ef352536f49 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -117,6 +117,8 @@ stat_allowed = HARD_CRIT /datum/emote/living/deathgasp/run_emote(mob/living/user, params, type_override, intentional) + if(!is_type_in_typecache(user, mob_type_allowed_typecache)) + return if(user.death_message) message_simple = user.death_message . = ..()