From 0564bd45cf1666e7a39823713770201cb8bc40f3 Mon Sep 17 00:00:00 2001 From: Glyphee <77804365+Glyphee@users.noreply.github.com> Date: Thu, 28 Sep 2023 17:59:41 -0400 Subject: [PATCH 1/2] adds placeholder human screams --- .../carbon/human/species_type/goblin.dm | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm index 2835d6721aca..e26067f25a81 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm @@ -42,6 +42,32 @@ /mob/living/carbon/human/species/goblin race = /datum/species/goblin +/datum/species/goblin/get_scream_sound(mob/living/carbon/human/human) + if(human.gender == MALE) + 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', + 'sound/voice/human/malescream_6.ogg', + ) + + 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', + ) +/datum/species/goblin/get_laugh_sound(mob/living/carbon/human/human) + if(human.gender == MALE) + return pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg') + else + return 'sound/voice/human/womanlaugh.ogg' + /datum/language_holder/goblin understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/goblin = list(LANGUAGE_ATOM)) From 2b234c8c68a69f1a189e2e39812b4e50be3a1d5b Mon Sep 17 00:00:00 2001 From: Glyphee <77804365+Glyphee@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:59:31 -0400 Subject: [PATCH 2/2] adds space for clarity --- .../code/modules/mob/living/carbon/human/species_type/goblin.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm index e26067f25a81..a941a712daf5 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/goblin.dm @@ -62,6 +62,7 @@ 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg', ) + /datum/species/goblin/get_laugh_sound(mob/living/carbon/human/human) if(human.gender == MALE) return pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg')