diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index 2e9732d966..c02c757a0a 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -231,6 +231,31 @@ emote_message_3p = "SHRIEKS!" emote_sound = 'sound/voice/shriek1.ogg' +/decl/emote/audible/caw + key = "caw" + emote_message_1p = "You caw!" + emote_message_3p = "caws!" + emote_message_1p_target = "You caw at TARGET." + emote_message_3p_target = "caws at TARGET." + emote_sound = 'sound/voice/emotes/caw1.ogg' // Copyright Sampling+ 1.0 Vixuxx (freesound.org) for the source audio. + +/decl/emote/audible/caw2 + key = "caw2" + emote_message_3p = "caws." + emote_sound = 'sound/voice/emotes/caw2.ogg' // Copyright CC0 1.0 Universal, by Jofae on freesound.org. + + +/decl/emote/audible/caw_m + key = "caw_m" + emote_message_3p = "caws multiple times." + emote_sound = 'sound/voice/emotes/caw_multiple.ogg' // Copyright CC0 1.0 Universal, by Ambientsoundapp on freesound.org. + +/decl/emote/audible/gwah + key = "gwah" + emote_message_3p = "gwah." + emote_sound = 'sound/voice/emotes/gwah.ogg' // Copyright CC0 1.0 Universal, by Ambientsoundapp on freesound.org. + + /decl/emote/audible/purr key = "purr" emote_message_3p = "purrs." diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 99bf1a5531..d0e122972f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -177,6 +177,10 @@ var/list/_human_default_emotes = list( /decl/emote/audible/croak_skrell, /decl/emote/audible/roarbark, /decl/emote/audible/dook, + /decl/emote/audible/caw, + /decl/emote/audible/caw2, + /decl/emote/audible/caw_m, + /decl/emote/audible/gwah, //VOREStation Add End //CHOMP Add start /decl/emote/audible/prbt2, @@ -339,6 +343,10 @@ var/list/_simple_mob_default_emotes = list( /decl/emote/audible/purr, /decl/emote/audible/purrlong, /decl/emote/audible/dook, + /decl/emote/audible/caw, + /decl/emote/audible/caw2, + /decl/emote/audible/caw_m, + /decl/emote/audible/gwah, //CHOMP Add start /decl/emote/audible/prbt2, /decl/emote/audible/pain, diff --git a/modular_chomp/code/modules/emotes/definitions/audiable.dm b/modular_chomp/code/modules/emotes/definitions/audiable.dm index 4039e3c7c4..4efa2d06f9 100644 --- a/modular_chomp/code/modules/emotes/definitions/audiable.dm +++ b/modular_chomp/code/modules/emotes/definitions/audiable.dm @@ -67,14 +67,6 @@ emote_message_3p_target = "gwahs at TARGET." emote_sound = 'sound/voice/emotes/gwah.ogg' -/decl/emote/audible/caw - key = "caw" - emote_message_1p = "You caw!" - emote_message_3p = "caws!" - emote_message_1p_target = "You caw at TARGET." - emote_message_3p_target = "caws at TARGET." - emote_sound = 'sound/voice/emotes/caw.ogg' // Copyright Sampling+ 1.0 Vixuxx (freesound.org) for the source audio. - /decl/emote/audible/wawa key = "wawa" emote_message_1p = "You wawa." diff --git a/sound/voice/emotes/caw.ogg b/sound/voice/emotes/caw1.ogg similarity index 100% rename from sound/voice/emotes/caw.ogg rename to sound/voice/emotes/caw1.ogg diff --git a/sound/voice/emotes/caw2.ogg b/sound/voice/emotes/caw2.ogg new file mode 100644 index 0000000000..23d11a8cf8 Binary files /dev/null and b/sound/voice/emotes/caw2.ogg differ diff --git a/sound/voice/emotes/caw_multiple.ogg b/sound/voice/emotes/caw_multiple.ogg new file mode 100644 index 0000000000..8a14df2214 Binary files /dev/null and b/sound/voice/emotes/caw_multiple.ogg differ