From 8518116cf52847feddb80884c9fc62a7ed39be76 Mon Sep 17 00:00:00 2001
From: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Date: Thu, 7 Mar 2024 11:57:04 -0600
Subject: [PATCH] Revert "check if species can use an emote even if their mob
 type can't (#24361)" (#24490)

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

diff --git a/code/datums/emote.dm b/code/datums/emote.dm
index c813add82fe..42304b2f879 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,10 +489,6 @@
 
 			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