From eb2b0fda8e4a41992aa04721ee9622c86cf5f455 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Mon, 15 Jul 2024 03:37:21 +0300
Subject: [PATCH] Fix Scream emote running the wrong emote (#84943)

## About The Pull Request

Blacklisted `/datum/emote/living/scream` for humans, since humans have
their better version

Also fixes a typo for `/datum/emote/carbon/human/scream`

~~So, we have two emotes for `key = "scream"`,
`/datum/emote/living/scream` and
`/datum/emote/living/carbon/human/scream`.~~

~~Since `/datum/emote/living/scream` is the first in the
GLOB.emote_list, it plays (and successfully) first in the list of two.~~

~~I'm not really sure how to "override" available emotes other than
restricting the "lesser" emote. So, any suggestions welcome...~~

## Why It's Good For The Game
Correct emote plays when a human scream

## Changelog
:cl:
fix: Correct emote plays when a human scream. Should have sound now.
/:cl:
---
 code/modules/mob/living/carbon/human/emote.dm | 2 +-
 code/modules/mob/living/emote.dm              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index f5c3ae6b499..be35872ed1a 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -66,7 +66,7 @@
 	only_forced_audio = TRUE
 	vary = TRUE
 
-/datum/emote/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
+/datum/emote/living/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
 	if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
 		return
 	return ..()
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 67358fa912a..9ccc26eec6c 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -355,6 +355,7 @@
 	message = "screams!"
 	message_mime = "acts out a scream!"
 	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	mob_type_blacklist_typecache = list(/mob/living/brain, /mob/living/carbon/human)
 
 /datum/emote/living/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
 	if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))