Merge pull request #585 from MisterGrimm/ScreamForMe

Added TGstation scream sound effects, and tweaked scream sound effect code.

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

@@ -694,13 +694,11 @@
 				if(!muzzled)
 					message = "[species.scream_verb]!"
 					m_type = 2
-					//CHOMPStation Edit Start. Uncommented block. Why was it commented in the first place?
-					//The offending content was commented out as well anyway.
-					if(get_gender() == FEMALE)
-						playsound(src, "[species.female_scream_sound]", 80, 1)
+					if(get_gender() == FEMALE) //CHOMPedit start : fixed scream sounds by giving them the ability to grab from a list, and a way to turn them off in preferences
+						playsound(src, pick(species.female_scream_sound), 80, preference = /datum/client_preference/emote_noises)
 					else
-						playsound(src, "[species.male_scream_sound]", 80, 1) //default to male screams if no gender is present.
-					//CHOMPStation Edit End.
+						playsound(src, pick(species.male_scream_sound), 80, preference = /datum/client_preference/emote_noises) //default to male screams if no gender is present.
+					//CHOMPedit end 
 				else
 					message = "makes a very loud noise."
 					m_type = 2

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

@@ -12,6 +12,9 @@
 	has_organ = list()
 	siemens_coefficient = 0
 
+	male_scream_sound = null //CHOMPedit It has no mouth yet it must scream
+	female_scream_sound = null //CHOMPedit
+
 	blood_color = "#CCCCCC"
 	flesh_color = "#AAAAAA"
 

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

@@ -15,6 +15,9 @@
 	spawn_flags = SPECIES_IS_RESTRICTED
 	appearance_flags = null
 
+	male_scream_sound = null //CHOMPedit Screaming skeletons would be funny, but needs better sounds
+	female_scream_sound = null //CHOMPedit
+
 	show_ssd = null
 
 	blood_volume = null

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

@@ -22,6 +22,9 @@
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin)
 	rarity_value = 15	//INTERDIMENSIONAL FLUFFERS
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	siemens_coefficient = 0
 	darksight = 10
 

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

@@ -75,8 +75,8 @@
 
 	//Soundy emotey things.
 	var/scream_verb = "screams"
-	var/male_scream_sound		//= 'sound/goonstation/voice/male_scream.ogg' Removed due to licensing, replace!
-	var/female_scream_sound		//= 'sound/goonstation/voice/female_scream.ogg' Removed due to licensing, replace!
+	var/male_scream_sound = list('sound/effects/mob_effects/m_scream_1.ogg','sound/effects/mob_effects/m_scream_2.ogg','sound/effects/mob_effects/m_scream_3.ogg','sound/effects/mob_effects/m_scream_4.ogg') //CHOMpedit start : Added tgstation screams
+	var/female_scream_sound = list('sound/effects/mob_effects/f_scream_1.ogg','sound/effects/mob_effects/f_scream_2.ogg','sound/effects/mob_effects/f_scream_3.ogg','sound/effects/mob_effects/f_scream_4.ogg') //CHOMPedit end
 	var/male_cough_sounds = list('sound/effects/mob_effects/m_cougha.ogg','sound/effects/mob_effects/m_coughb.ogg', 'sound/effects/mob_effects/m_coughc.ogg')
 	var/female_cough_sounds = list('sound/effects/mob_effects/f_cougha.ogg','sound/effects/mob_effects/f_coughb.ogg')
 	var/male_sneeze_sound = 'sound/effects/mob_effects/sneeze.ogg'

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

@@ -16,6 +16,9 @@
 	base_species = SPECIES_ALRAUNE
 	selects_bodytype = TRUE
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	body_temperature = T20C
 	breath_type = "oxygen"
 	poison_type = "phoron"

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

@@ -22,6 +22,9 @@
 	you select and set this species as your species. Please look at the VORE tab if you select this species."
 	catalogue_data = list(/datum/category_item/catalogue/fauna/custom_species)
 
+	male_scream_sound = null //CHOMPedit These are going to be a hassle for custom species if not null
+	female_scream_sound = null //CHOMPedit
+
 	name_language = null // Use the first-name last-name generator rather than a language scrambler
 	min_age = 18
 	max_age = 200

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

@@ -11,6 +11,9 @@
 	spawn_flags = SPECIES_IS_RESTRICTED
 	siemens_coefficient = 0
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	assisted_langs = list()
 
 	breath_type = null

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

@@ -27,7 +27,8 @@
 	darksight = 5
 	reagent_tag = IS_GREY
 
-
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
 
 	min_age = 18
 	max_age = 130

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

@@ -22,6 +22,9 @@
 	tail = "chimptail"
 	fire_icon_state = "monkey"
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	unarmed_types = list(/datum/unarmed_attack/bite, /datum/unarmed_attack/claws)
 	inherent_verbs = list(/mob/living/proc/ventcrawl)
 	hud_type = /datum/hud_data/monkey

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

@@ -6,6 +6,8 @@
 	tail = null //The tail is part of its body due to tail using the "icons/effects/species.dmi" file. It must be null, or they'll have a chimp tail.
 	greater_form = "Akula"
 	default_language = "Skrellian" //Closest we have.
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
 
 /datum/species/monkey/sergal
 	name = SPECIES_MONKEY_SERGAL
@@ -14,6 +16,8 @@
 	deform = 'icons/mob/human_races/monkeys/r_sergaling_vr.dmi'
 	tail = null
 	default_language = LANGUAGE_SAGARU
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
 
 /datum/species/monkey/sparra
 	name = SPECIES_MONKEY_NEVREAN
@@ -23,6 +27,8 @@
 	icobase = 'icons/mob/human_races/monkeys/r_sparra_vr.dmi'
 	deform = 'icons/mob/human_races/monkeys/r_sparra_vr.dmi'
 	default_language = LANGUAGE_BIRDSONG
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
 
 
 /* Example from Polaris code
@@ -52,6 +58,8 @@
 	flesh_color = "#966464"
 	base_color = "#000000"
 	tail = null
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
 
 //INSERT CODE HERE SO MONKEYS CAN BE SPAWNED.
 //Also, M was added to the end of the spawn names to signify that it's a monkey, since some names were conflicting.

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

@@ -49,6 +49,9 @@ var/datum/species/shapeshifter/promethean/prometheans
 
 	economic_modifier = 3
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	gluttonous =	1
 	virus_immune =	1
 	blood_volume =	560

code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm

@@ -26,6 +26,9 @@
 	breath_type = null
 	poison_type = null
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	virus_immune =	1
 	blood_volume =	0
 	min_age =		18

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

@@ -76,6 +76,9 @@
 	max_age = 260
 
 	economic_modifier = 10
+	
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
 
 	blurb = "A heavily reptillian species, Unathi hail from the \
 	Uuosa-Eso system, which roughly translates to 'burning mother'.<br/><br/>Coming from a harsh, inhospitable \
@@ -191,6 +194,9 @@
 
 	economic_modifier = 10
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "The Tajaran are a mammalian species resembling roughly felines, hailing from Meralar in the Rarkajar system. \
 	While reaching to the stars independently from outside influences, the humans engaged them in peaceful trade contact \
 	and have accelerated the fledgling culture into the interstellar age. Their history is full of war and highly fractious \
@@ -280,6 +286,9 @@
 
 	economic_modifier = 10
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	darksight = 4
 	flash_mod = 1.2
 	chemOD_mod = 0.9
@@ -358,6 +367,9 @@
 	min_age = 16
 	max_age = 90
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "The Zaddat are an Unathi client race only recently introduced to SolGov space. Having evolved on \
 	the high-pressure and post-apocalyptic world of Xohok, Zaddat require an environmental suit called a Shroud \
 	to survive in usual planetary and station atmospheres. Despite these restrictions, worsening conditions on \
@@ -470,6 +482,9 @@
 
 	economic_modifier = 10
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
 	species hailing from Epsilon Ursae Minoris. Each 'diona' is a cluster of numerous cat-sized organisms called nymphs; \
 	there is no effective upper limit to the number that can fuse in gestalt, and reports exist	of the Epsilon Ursae \

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

@@ -38,6 +38,9 @@
 	min_age = 18
 	max_age = 80
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "Some amalgamation of different species from across the universe,with extremely unstable DNA, making them unfit for regular cloners. \
 	Widely known for their voracious nature and violent tendencies when stressed or left unfed for long periods of time. \
 	Most, if not all chimeras possess the ability to undergo some type of regeneration process, at the cost of energy."
@@ -381,6 +384,9 @@
 	min_age = 18
 	max_age = 80
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "Vasilissans are a tall, lanky, spider like people. \
 	Each having four eyes, an extra four, large legs sprouting from their back, and a chitinous plating on their body, and the ability to spit webs \
 	from their mandible lined mouths.  They are a recent discovery by Nanotrasen, only being discovered roughly seven years ago.  \
@@ -451,6 +457,9 @@
 	min_age = 18
 	max_age = 200
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "Big buff werewolves. These are a limited functionality event species that are not balanced for regular gameplay. Adminspawn only."
 
 	wikilink="N/A"

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

@@ -19,6 +19,9 @@
 	min_age = 18
 	max_age = 110
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "There are two subspecies of Sergal; Southern and Northern. Northern sergals are a highly aggressive race \
 	that lives in the plains and tundra of their homeworld. They are characterized by long, fluffy fur bodies with cold colors; \
 	usually with white abdomens, somewhat short ears, and thick faces. Southern sergals are much more docile and live in the \
@@ -85,6 +88,9 @@
 	min_age = 18
 	max_age = 110
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "The Akula are a species of amphibious humanoids like the Skrell, but have an appearance very similar to that of a shark. \
 	They were first discovered as a primitive race of underwater dwelling tribal creatures by the Skrell. At first they were not believed \
 	to be noteworthy, but the Akula proved to be such swift and clever learners that the Skrell reclassified them as sentients. Allegedly, \
@@ -132,6 +138,9 @@
 	min_age = 18
 	max_age = 110
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus, \
 	in the Vilous system. Unlike sergals whom they share a star system with, their species is a very peaceful one. They possess remarkable \
 	intelligence and very skillful hands that are put use for constructing precision instruments, but tire-out fast when repeatedly working \
@@ -174,6 +183,9 @@
 	min_age = 18
 	max_age = 110
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \
 	and the other with longer fur that is a bit more vibrant. The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that \
 	is where most of their settlements are located. The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be \
@@ -221,6 +233,9 @@
 	color_mult = 1
 	inherent_verbs = list(/mob/living/proc/shred_limb, /mob/living/carbon/human/proc/lick_wounds)
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \
 	dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \
 	culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \
@@ -386,6 +401,9 @@ datum/species/harpy
 
 	base_color = "#EECEB3"
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "An Avian species, coming from a distant planet, the Rapalas are the very proud race.\
 	Sol researchers have commented on them having a very close resemblance to the mythical race called 'Harpies',\
 	who are known for having massive winged arms and talons as feet. They've been clocked at speeds of over 35 miler per hour chasing the planet's many fish-like fauna.\
@@ -413,6 +431,8 @@ datum/species/harpy
 	deform = 'icons/mob/human_races/r_shadekin_vr.dmi'
 	tail = "tail"
 	icobase_tail = 1
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
 	blurb = "Very little is known about these creatures. They appear to be largely mammalian in appearance. \
 	Seemingly very rare to encounter, there have been widespread myths of these creatures the galaxy over, \
 	but next to no verifiable evidence to their existence. However, they have recently been more verifiably \
@@ -537,6 +557,9 @@ datum/species/harpy
 	min_age = 18
 	max_age = 80
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	//primitive_form = "" //We don't have fennec-monkey sprites.
 	spawn_flags = SPECIES_IS_RESTRICTED
 	appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
@@ -568,6 +591,9 @@ datum/species/harpy
 	min_age = 18
 	max_age = 80
 
+	male_scream_sound = null //CHOMPedit
+	female_scream_sound = null //CHOMPedit
+
 	blurb = "Xenomorphs hybrids are a mixture of xenomorph DNA and some other humanoid species. \
 	Xenomorph hyrids mostly have had had their natural aggression removed due to the gene modification process \
 	although there are some exceptions, such as when they are harmed. Most xenomorph hybrids are female, due to their natural xenomorph genes, \

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

@@ -10,6 +10,9 @@
 	hud_type = /datum/hud_data/alien
 	rarity_value = 3
 
+	male_scream_sound = null //CHOMPedit Note, add xenomorph screams later, shouldn't be hard
+	female_scream_sound = null //CHOMPedit
+
 	darksight = 10 //CHOMPedit. Added darksight
 	vision_flags = SEE_SELF|SEE_MOBS|SEE_TURFS //CHOMPedit trying to make xenos see properly