Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

h #956

Merged
merged 1 commit into from Jan 16, 2024
Merged

h #956

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
21 changes: 21 additions & 0 deletions monkestation/code/modules/mob/living/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,24 @@

/datum/emote/living/meow/get_sound(mob/living/user)
return pick('monkestation/sound/voice/feline/meow1.ogg', 'monkestation/sound/voice/feline/meow2.ogg', 'monkestation/sound/voice/feline/meow3.ogg', 'monkestation/sound/voice/feline/meow4.ogg')

/datum/emote/living/bark/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
. = ..()
if(HAS_TRAIT(user, TRAIT_ANIME))
return TRUE
else
return FALSE
/datum/emote/living/bark
key = "bark"
key_third_person = "barks"
message = "barks!"
message_mime = "barks out silence!"
message_ipc = "makes a synthetic bark!"
message_param = "barks at %t!"
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
/datum/emote/living/bark/get_sound(mob/living/user)
if(HAS_TRAIT(user, TRAIT_CLUMSY))
return 'monkestation/sound/voice/feline/bark.ogg'
else
return pick('monkestation/sound/voice/feline/bark.ogg','monkestation/sound/voice/feline/bark2.ogg') // Yes, bark trait in feline folder [Bad To The Bone]

Binary file added monkestation/sound/voice/feline/bark.ogg
Binary file not shown.
Binary file added monkestation/sound/voice/feline/bark2.ogg
Binary file not shown.
Loading