diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index fac713f184e5..b9b84b589fc1 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -68,8 +68,8 @@ 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(islizard(H)) //yogs start: adds lizard screams - return 'yogstation/sound/voice/lizardperson/lizard_scream.ogg' //yogs end + 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. /datum/emote/living/carbon/human/pale diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index ae392744185a..8155e6b1222b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -48,6 +48,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/deathsound //used to set the mobs deathsound on species change var/list/special_step_sounds //Sounds to override barefeet walkng var/grab_sound //Special sound for grabbing + var/screamsound //yogs - audio of a species' scream // species-only traits. Can be found in DNA.dm var/list/species_traits = list() diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 96d3ff2cfaa8..b695241e7281 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -23,6 +23,7 @@ liked_food = GROSS | MEAT inert_mutation = FIREBREATH deathsound = 'sound/voice/lizard/deathsound.ogg' + screamsound = 'yogstation/sound/voice/lizardperson/lizard_scream.ogg' //yogs - lizard scream /datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H) H.grant_language(/datum/language/draconic) diff --git a/goon/sound/robot_scream.ogg b/goon/sound/robot_scream.ogg new file mode 100644 index 000000000000..5db056a77135 Binary files /dev/null and b/goon/sound/robot_scream.ogg differ diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 2661e884fd33..235d59c29e37 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -29,6 +29,7 @@ adjust_charge - take a positive or negative value to adjust the charge level var/power_drain = 0.5 //probably going to have to tweak this shit var/tesliumtrip = FALSE var/draining = FALSE + screamsound = 'goon/sound/robot_scream.ogg' /datum/species/preternis/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) . = ..()