From 6fcc7d8b75a4da8add3ae623de25bcf0988cd368 Mon Sep 17 00:00:00 2001
From: Roxy <75404941+TealSeer@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:38:45 -0400
Subject: [PATCH] Fix screaming (#4835)

## About The Pull Request


https://github.com/Bubberstation/Bubberstation/commit/bf8b97fbaedc8ff46053fac7e254722187922b11
merged `/datum/emote/living/human/scream` into
`/datum/emote/living/scream` and our modular code needed to be adjusted

## Why It's Good For The Game

Bug fix

## Proof Of Testing

Yes

## Changelog
:cl:
fix: fixed screaming not working
/:cl:
---
 .../modules/emotes/code/scream_emote.dm       | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/modular_skyrat/modules/emotes/code/scream_emote.dm b/modular_skyrat/modules/emotes/code/scream_emote.dm
index 9ae0add2410..7e805b1a56a 100644
--- a/modular_skyrat/modules/emotes/code/scream_emote.dm
+++ b/modular_skyrat/modules/emotes/code/scream_emote.dm
@@ -1,6 +1,6 @@
 /datum/emote/living/scream
 	vary = TRUE
-	mob_type_blacklist_typecache = list(/mob/living/carbon/human, /mob/living/basic/slime, /mob/living/brain) //Humans get specialized scream.
+	mob_type_blacklist_typecache = list(/mob/living/basic/slime, /mob/living/brain)
 
 /datum/emote/living/scream/get_sound(mob/living/user)
 	if(issilicon(user))
@@ -20,6 +20,17 @@
 		return 'sound/mobs/non-humanoids/gorilla/gorilla.ogg'
 	if(isalien(user))
 		return 'sound/mobs/non-humanoids/hiss/hiss6.ogg'
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/human_user = user
+	if(isnull(human_user.selected_scream) || (LAZYLEN(human_user.selected_scream.male_screamsounds) && LAZYLEN(human_user.selected_scream.female_screamsounds))) //For things that don't have a selected scream(npcs)
+		if(prob(1))
+			return 'sound/mobs/humanoids/human/scream/wilhelm_scream.ogg'
+		return human_user.dna.species.get_scream_sound(human_user)
+	if(human_user.gender == FEMALE && LAZYLEN(human_user.selected_scream.female_screamsounds))
+		return pick(human_user.selected_scream.female_screamsounds)
+	else
+		return pick(human_user.selected_scream.male_screamsounds)
 
 /datum/emote/living/scream/can_run_emote(mob/living/user, status_check, intentional)
 	if(iscyborg(user))
@@ -30,18 +41,3 @@
 			return FALSE
 		robot_user.cell.use(STANDARD_CELL_CHARGE * 0.2)
 	return ..()
-
-/datum/emote/living/carbon/human/scream
-	only_forced_audio = FALSE
-
-/datum/emote/living/carbon/human/scream/get_sound(mob/living/carbon/human/user)
-	if(!istype(user))
-		return
-	if(isnull(user.selected_scream) || (LAZYLEN(user.selected_scream.male_screamsounds) && LAZYLEN(user.selected_scream.female_screamsounds))) //For things that don't have a selected scream(npcs)
-		if(prob(1))
-			return 'sound/mobs/humanoids/human/scream/wilhelm_scream.ogg'
-		return user.dna.species.get_scream_sound(user)
-	if(user.gender == FEMALE && LAZYLEN(user.selected_scream.female_screamsounds))
-		return pick(user.selected_scream.female_screamsounds)
-	else
-		return pick(user.selected_scream.male_screamsounds)