Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
},
"files.eol": "\n",
"gitlens.advanced.blame.customArguments": ["-w"]
}
}
16 changes: 15 additions & 1 deletion code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
Binary file added sound/voice/feline/meow1.ogg
Binary file not shown.
Binary file added sound/voice/feline/meow2.ogg
Binary file not shown.
Binary file added sound/voice/feline/meow3.ogg
Binary file not shown.
Binary file added sound/voice/feline/meow4.ogg
Binary file not shown.
Binary file added sound/voice/feline/scream1.ogg
Binary file not shown.
Binary file added sound/voice/feline/scream2.ogg
Binary file not shown.
Binary file added sound/voice/feline/scream3.ogg
Binary file not shown.