diff --git a/.vscode/settings.json b/.vscode/settings.json index deb10825250a..fb9cb43db606 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,4 +12,4 @@ }, "files.eol": "\n", "gitlens.advanced.blame.customArguments": ["-w"] -} +} \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index d16b5b0a1b19..42050880f201 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -75,7 +75,9 @@ var/mob/living/carbon/human/H = user if(H.mind?.miming) return - if(ishumanbasic(H) || iscatperson(H)) + 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 @@ -87,6 +89,18 @@ 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/meow + key = "meow" + key_third_person = "meows" + message = "meows." + emote_type = EMOTE_AUDIBLE + cooldown = 10 SECONDS + +/datum/emote/living/carbon/meow/can_run_emote(mob/living/user, status_check = TRUE, intentional) + return iscatperson(user) + +/datum/emote/living/carbon/meow/get_sound(mob/living/user) + return pick('sound/voice/feline/meow1.ogg', 'sound/voice/feline/meow2.ogg', 'sound/voice/feline/meow3.ogg', 'sound/voice/feline/meow4.ogg', 'sound/effects/meow1.ogg') /datum/emote/living/carbon/human/pale key = "pale" diff --git a/sound/voice/feline/meow1.ogg b/sound/voice/feline/meow1.ogg new file mode 100644 index 000000000000..1f05cca2444e Binary files /dev/null and b/sound/voice/feline/meow1.ogg differ diff --git a/sound/voice/feline/meow2.ogg b/sound/voice/feline/meow2.ogg new file mode 100644 index 000000000000..4990e2ffc696 Binary files /dev/null and b/sound/voice/feline/meow2.ogg differ diff --git a/sound/voice/feline/meow3.ogg b/sound/voice/feline/meow3.ogg new file mode 100644 index 000000000000..a81f5f7f000b Binary files /dev/null and b/sound/voice/feline/meow3.ogg differ diff --git a/sound/voice/feline/meow4.ogg b/sound/voice/feline/meow4.ogg new file mode 100644 index 000000000000..63d4699b9e09 Binary files /dev/null and b/sound/voice/feline/meow4.ogg differ diff --git a/sound/voice/feline/scream1.ogg b/sound/voice/feline/scream1.ogg new file mode 100644 index 000000000000..ea40a7a4b0f9 Binary files /dev/null and b/sound/voice/feline/scream1.ogg differ diff --git a/sound/voice/feline/scream2.ogg b/sound/voice/feline/scream2.ogg new file mode 100644 index 000000000000..c6f0642ac9bc Binary files /dev/null and b/sound/voice/feline/scream2.ogg differ diff --git a/sound/voice/feline/scream3.ogg b/sound/voice/feline/scream3.ogg new file mode 100644 index 000000000000..eb2040444404 Binary files /dev/null and b/sound/voice/feline/scream3.ogg differ