Improve screams

code/modules/mob/living/carbon/human/emote.dm

@@ -83,19 +83,8 @@
 	var/mob/living/carbon/human/H = user
 	if(H.mind?.miming)
 		return
-	if(iscatperson(H))
-		return pick('sound/voice/feline/scream1.ogg', 'sound/voice/feline/scream2.ogg', 'sound/voice/feline/scream3.ogg')
-	else if(ishumanbasic(H))
-		if(user.gender == FEMALE)
-			return pick('sound/voice/human/femalescream_1.ogg', 'sound/voice/human/femalescream_2.ogg', 'sound/voice/human/femalescream_3.ogg', 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg')
-		else
-			if(prob(1))
-				return 'sound/voice/human/wilhelm_scream.ogg'
-			return pick('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg')
-	else if(ismoth(H))
-		return 'sound/voice/moth/scream_moth.ogg'
-	else if(H.dna?.species?.screamsound) //yogs start: grabs scream from screamsound located in the appropriate species file.
-		return H.dna.species.screamsound //yogs end - current added screams: lizard, preternis.
+	if(H.dna?.species) //yogs start: grabs scream from screamsound located in the appropriate species file.
+		return H.dna.species.get_scream_sound(H) //yogs end - current added screams: basic human, moth, lizard, preternis, felinid.
 
 /datum/emote/living/carbon/meow
 	key = "meow"

code/modules/mob/living/carbon/human/species.dm

@@ -2120,3 +2120,8 @@ GLOBAL_LIST_EMPTY(mentor_races)
 		. |= BIO_JUST_FLESH
 	if(HAS_BONE in species_traits)
 		. |= BIO_JUST_BONE
+
+/datum/species/proc/get_scream_sound(mob/living/carbon/human/H)
+	if(islist(screamsound))
+		return pick(screamsound)
+	return screamsound

code/modules/mob/living/carbon/human/species_types/felinid.dm

@@ -14,6 +14,8 @@
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
 	species_language_holder = /datum/language_holder/felinid
 
+	screamsound = list('sound/voice/feline/scream1.ogg', 'sound/voice/feline/scream2.ogg', 'sound/voice/feline/scream3.ogg')
+
 /datum/species/human/felinid/qualifies_for_rank(rank, list/features)
 	return TRUE
 
@@ -111,3 +113,6 @@
 	. = ..()
 	if(H.reagents.has_reagent(/datum/reagent/consumable/ethanol/catsip))
 		H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY)
+
+/datum/species/human/felinid/get_scream_sound(mob/living/carbon/human/H)
+	return pick(screamsound)

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -11,8 +11,19 @@
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
 	species_language_holder = /datum/language_holder/english
 
+	var/list/female_screams = list('sound/voice/human/femalescream_1.ogg', 'sound/voice/human/femalescream_2.ogg', 'sound/voice/human/femalescream_3.ogg', 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg')
+	var/list/male_screams = list('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg')
+
 /datum/species/human/qualifies_for_rank(rank, list/features)
 	return TRUE	//Pure humans are always allowed in all roles.
 
 /datum/species/human/has_toes()
 	return TRUE
+
+/datum/species/human/get_scream_sound(mob/living/carbon/human/H)
+	if(H.gender == FEMALE)
+		return pick(female_screams)
+	else
+		if(prob(1))
+			return 'sound/voice/human/wilhelm_scream.ogg'
+		return pick(male_screams)

code/modules/mob/living/carbon/human/species_types/mothmen.dm

@@ -19,6 +19,8 @@
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
 	species_language_holder = /datum/language_holder/mothmen
 
+	screamsound = 'sound/voice/moth/scream_moth.ogg'
+
 /datum/species/moth/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE)
 	. = ..()
 	if(ishuman(C))