diff --git a/code/modules/mob/living/carbon/human/voicepacks/genfemale.dm b/code/modules/mob/living/carbon/human/voicepacks/genfemale.dm index 1a82c1e6547..11dca90027c 100644 --- a/code/modules/mob/living/carbon/human/voicepacks/genfemale.dm +++ b/code/modules/mob/living/carbon/human/voicepacks/genfemale.dm @@ -174,4 +174,8 @@ used = list('sound/vo/LizardSqueal.ogg') if("thump") used = list('sound/vo/LizardThump.ogg') + if("foxscream") + used = list('modular_causticcove/sound/vo/vulp_scream1.ogg', 'modular_causticcove/sound/vo/vulp_scream2.ogg', 'modular_causticcove/sound/vo/vulp_scream3.ogg', 'modular_causticcove/sound/vo/vulp_scream4.ogg') + if("snarl") + used = list('modular_causticcove/sound/vo/dog_snarl1.ogg', 'modular_causticcove/sound/vo/dog_snarl2.ogg', 'modular_causticcove/sound/vo/dog_snarl3.ogg') return used diff --git a/code/modules/mob/living/carbon/human/voicepacks/genmale.dm b/code/modules/mob/living/carbon/human/voicepacks/genmale.dm index dc2b3e73115..6e95953eb49 100644 --- a/code/modules/mob/living/carbon/human/voicepacks/genmale.dm +++ b/code/modules/mob/living/carbon/human/voicepacks/genmale.dm @@ -177,4 +177,8 @@ used = list('sound/vo/LizardSqueal.ogg') if("thump") used = list('sound/vo/LizardThump.ogg') + if("foxscream") + used = list('modular_causticcove/sound/vo/vulp_scream1.ogg', 'modular_causticcove/sound/vo/vulp_scream2.ogg', 'modular_causticcove/sound/vo/vulp_scream3.ogg', 'modular_causticcove/sound/vo/vulp_scream4.ogg') + if("snarl") + used = list('modular_causticcove/sound/vo/dog_snarl1.ogg', 'modular_causticcove/sound/vo/dog_snarl2.ogg', 'modular_causticcove/sound/vo/dog_snarl3.ogg') return used diff --git a/modular_causticcove/code/modules/mob/living/carbon/human/emote_noises.dm b/modular_causticcove/code/modules/mob/living/carbon/human/emote_noises.dm new file mode 100644 index 00000000000..0e8cedabaf2 --- /dev/null +++ b/modular_causticcove/code/modules/mob/living/carbon/human/emote_noises.dm @@ -0,0 +1,37 @@ +//Caustic modular file for noisemotes + +/datum/emote/living/foxscream + key = "foxscream" + key_third_person = "yelps" + message = "yelps!" + emote_type = EMOTE_AUDIBLE + message_muffled = "makes a muffled yelp!" + is_animal = TRUE + show_runechat = FALSE + +/mob/living/carbon/human/verb/foxscream() + if(istype(usr.getorganslot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/wild_tongue)) + set name = "Foxscream" + set category = "NOISES" + emote("foxscream", intentional = TRUE) + else + to_chat(usr, span_warning("Your tongue doesn't do that")) + return + +/datum/emote/living/snarl + key = "snarl" + key_third_person = "snarls" + message = "Snarls!" + emote_type = EMOTE_AUDIBLE + message_muffled = "makes a muffled snarl!" + is_animal = TRUE + show_runechat = FALSE + +/mob/living/carbon/human/verb/snarl() + if(istype(usr.getorganslot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/wild_tongue)) + set name = "Snarl" + set category = "NOISES" + emote("snarl", intentional = TRUE) + else + to_chat(usr, span_warning("Your tongue doesn't do that")) + return diff --git a/modular_causticcove/sound/vo/dog_snarl1.ogg b/modular_causticcove/sound/vo/dog_snarl1.ogg new file mode 100644 index 00000000000..4493be060cc Binary files /dev/null and b/modular_causticcove/sound/vo/dog_snarl1.ogg differ diff --git a/modular_causticcove/sound/vo/dog_snarl2.ogg b/modular_causticcove/sound/vo/dog_snarl2.ogg new file mode 100644 index 00000000000..6529e4e05d0 Binary files /dev/null and b/modular_causticcove/sound/vo/dog_snarl2.ogg differ diff --git a/modular_causticcove/sound/vo/dog_snarl3.ogg b/modular_causticcove/sound/vo/dog_snarl3.ogg new file mode 100644 index 00000000000..fb9e4c7ec7b Binary files /dev/null and b/modular_causticcove/sound/vo/dog_snarl3.ogg differ diff --git a/modular_causticcove/sound/vo/vulp_scream1.ogg b/modular_causticcove/sound/vo/vulp_scream1.ogg new file mode 100644 index 00000000000..af52e55c9a3 Binary files /dev/null and b/modular_causticcove/sound/vo/vulp_scream1.ogg differ diff --git a/modular_causticcove/sound/vo/vulp_scream2.ogg b/modular_causticcove/sound/vo/vulp_scream2.ogg new file mode 100644 index 00000000000..293175ec602 Binary files /dev/null and b/modular_causticcove/sound/vo/vulp_scream2.ogg differ diff --git a/modular_causticcove/sound/vo/vulp_scream3.ogg b/modular_causticcove/sound/vo/vulp_scream3.ogg new file mode 100644 index 00000000000..68bb49fa424 Binary files /dev/null and b/modular_causticcove/sound/vo/vulp_scream3.ogg differ diff --git a/modular_causticcove/sound/vo/vulp_scream4.ogg b/modular_causticcove/sound/vo/vulp_scream4.ogg new file mode 100644 index 00000000000..46f834ac43b Binary files /dev/null and b/modular_causticcove/sound/vo/vulp_scream4.ogg differ diff --git a/roguetown.dme b/roguetown.dme index e63dcb34050..cfa8118559a 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -3532,6 +3532,7 @@ #include "modular_causticcove\code\modules\mob\living\carbon\hobgoblin\hobgoblin.dm" #include "modular_causticcove\code\modules\mob\living\carbon\hobgoblin\npc\hobgoblin_npc.dm" #include "modular_causticcove\code\modules\mob\living\carbon\hobgoblin\species\hobgoblin_species.dm" +#include "modular_causticcove\code\modules\mob\living\carbon\human\emote_noises.dm" #include "modular_causticcove\code\modules\mob\living\carbon\human\species_types\witchshape\bat.dm" #include "modular_causticcove\code\modules\mob\living\carbon\human\species_types\witchshape\cabbit.dm" #include "modular_causticcove\code\modules\mob\living\carbon\human\species_types\witchshape\cat.dm"