From 6eb4f325393f7c3f5e0c4edefcc620805fd3cf97 Mon Sep 17 00:00:00 2001
From: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Date: Wed, 6 Mar 2024 08:30:01 -0600
Subject: [PATCH] check if species can use an emote even if their mob type
 can't (#24361)

---
 code/datums/emote.dm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/datums/emote.dm b/code/datums/emote.dm
index 42304b2f879..c813add82fe 100644
--- a/code/datums/emote.dm
+++ b/code/datums/emote.dm
@@ -477,9 +477,9 @@
 	. = TRUE
 	if(!is_type_in_typecache(user, mob_type_allowed_typecache))
 		return FALSE
-	if(is_type_in_typecache(user, mob_type_blacklist_typecache))
-		return FALSE
 
+	// the user's mob type may not be allowed, but its species could be
+	var/species_can_use = FALSE
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		if(H.dna)
@@ -489,6 +489,10 @@
 
 			if(species_type_blacklist_typecache && is_type_in_typecache(H.dna.species, species_type_blacklist_typecache))
 				return FALSE
+			species_can_use = TRUE
+
+	if(is_type_in_typecache(user, mob_type_blacklist_typecache) && !species_can_use)
+		return FALSE
 
 	if(intentional && only_unintentional)
 		return FALSE