fix

cmss13-devs · Aug 13, 2024 · e5f8b1c · e5f8b1c
1 parent 05f4f31
commit e5f8b1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
@@ -33,6 +33,8 @@
 #define EMOTE_IMPORTANT (1<<2)
 /// Does the emote not have a message?
 #define EMOTE_NO_MESSAGE (1<<3)
+///	Can only code call this event instead of the player.
+#define EMOTE_FORCED_AUDIO (1<<4)
 
 // Bitflags for Working Joe emotes
 /// Working Joe emote

diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
@@ -262,6 +262,9 @@
 		return FALSE
 	if(is_type_in_typecache(user, mob_type_blacklist_typecache))
 		return FALSE
+	if(intentional)
+		if(emote_type & EMOTE_FORCED_AUDIO)
+			return FALSE
 	if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache))
 		if(user.stat > stat_allowed)
 			if(!intentional)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
@@ -387,7 +387,7 @@
 /datum/emote/living/carbon/human/burstscream
 	key = "burstscream"
 	message = "screams in agony!"
-	emote_type = EMOTE_AUDIBLE
+	emote_type = EMOTE_FORCED_AUDIO|EMOTE_AUDIBLE|EMOTE_VISIBLE
 	stat_allowed = UNCONSCIOUS
 
 /datum/emote/living/carbon/human/burstscream/get_sound(mob/living/carbon/human/user)