diff --git a/modular_ss220/_defines220/code/emote.dm b/modular_ss220/_defines220/code/emote.dm index c85d5c941aa4..37a769f462f6 100644 --- a/modular_ss220/_defines220/code/emote.dm +++ b/modular_ss220/_defines220/code/emote.dm @@ -124,6 +124,7 @@ #define EMOTE_HUMAN_MEOW "Мяукнуть" #define EMOTE_HUMAN_MROW "Мяукнуть раздражённо" #define EMOTE_HUMAN_MROWSS "Мурчать коротко" +#define EMOTE_HUMAN_WURBLE "Приглушенно рычать" /// Carbon Emotes #define EMOTE_CARBON_BLINK "Моргать" diff --git a/modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg b/modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg new file mode 100644 index 000000000000..d84da618fece Binary files /dev/null and b/modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg differ diff --git a/modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg b/modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg new file mode 100644 index 000000000000..9147419a9236 Binary files /dev/null and b/modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg differ diff --git a/modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg b/modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg new file mode 100644 index 000000000000..23948fd6c17f Binary files /dev/null and b/modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg differ diff --git a/modular_ss220/emotes/audio/vulpkanin/wurble.ogg b/modular_ss220/emotes/audio/vulpkanin/wurble.ogg new file mode 100644 index 000000000000..2445f989832a Binary files /dev/null and b/modular_ss220/emotes/audio/vulpkanin/wurble.ogg differ diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm index 7cbd9b8e7f2c..b5ecd2f0ecda 100644 --- a/modular_ss220/emotes/code/emote.dm +++ b/modular_ss220/emotes/code/emote.dm @@ -457,3 +457,16 @@ cooldown = 5 SECONDS volume = 50 muzzled_noises = list("слабо") + +/datum/emote/living/carbon/human/wurble + key = "wurble" + key_third_person = "wurble" + message = "приглушенно рычит" + message_param = "приглушенно рычит на %t." + sound = 'modular_ss220/emotes/audio/vulpkanin/wurble.ogg' + species_type_whitelist_typecache = list(/datum/species/vulpkanin) + emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE + vary = TRUE + cooldown = 5 SECONDS + volume = 50 + muzzled_noises = list("слабо") diff --git a/modular_ss220/emotes/code/emote_names.dm b/modular_ss220/emotes/code/emote_names.dm index 11f37049a51c..cc6c0105c194 100644 --- a/modular_ss220/emotes/code/emote_names.dm +++ b/modular_ss220/emotes/code/emote_names.dm @@ -467,6 +467,9 @@ /datum/emote/living/carbon/human/tajaran/mrowss name = EMOTE_HUMAN_MROWSS +/datum/emote/living/carbon/human/vulpkanin/wurble + name = EMOTE_HUMAN_WURBLE + /// Emote Animal /datum/emote/living/simple_animal/gorilla/ooga diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm index 18e9058cd3bb..a86b5e598dac 100644 --- a/modular_ss220/emotes/code/emote_verbs.dm +++ b/modular_ss220/emotes/code/emote_verbs.dm @@ -99,6 +99,12 @@ set category = "Эмоции" emote("mrowss", intentional = TRUE) +/mob/living/carbon/human/proc/emote_wurble() + set name = "< " + EMOTE_HUMAN_WURBLE + " >" + set category = "Эмоции" + emote("wurble", intentional = TRUE) + + /// Action Emotes /// /mob/living/carbon/human/verb/emote_collapse() set name = "○ " + EMOTE_COLLAPSE + " " diff --git a/modular_ss220/emotes/code/racial_emotes.dm b/modular_ss220/emotes/code/racial_emotes.dm index 4d66e42b7c7b..65e087fc4e44 100644 --- a/modular_ss220/emotes/code/racial_emotes.dm +++ b/modular_ss220/emotes/code/racial_emotes.dm @@ -6,6 +6,7 @@ H.verbs |= /mob/living/carbon/human/proc/emote_growl H.verbs |= /mob/living/carbon/human/proc/emote_bark H.verbs |= /mob/living/carbon/human/proc/emote_wbark + H.verbs |= /mob/living/carbon/human/proc/emote_wurble /datum/species/vulpkanin/on_species_loss(mob/living/carbon/human/H) ..() @@ -15,6 +16,7 @@ H.verbs -= /mob/living/carbon/human/proc/emote_growl H.verbs -= /mob/living/carbon/human/proc/emote_bark H.verbs -= /mob/living/carbon/human/proc/emote_wbark + H.verbs -= /mob/living/carbon/human/proc/emote_wurble /datum/species/diona/on_species_gain(mob/living/carbon/human/H) ..() diff --git a/modular_ss220/emotes/code/species.dm b/modular_ss220/emotes/code/species.dm index 399529787821..5acd260fd09c 100644 --- a/modular_ss220/emotes/code/species.dm +++ b/modular_ss220/emotes/code/species.dm @@ -322,7 +322,12 @@ "r" = list("r", "rr", "rrr"), "р" = list("р", "рр", "ррр")) autohiss_exempt = list("Canilunzt") - + male_scream_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg' + female_scream_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg' + male_giggle_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg' + female_giggle_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg' + male_laugh_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg' + female_laugh_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg' scream_verb = "скулит" suicide_messages = list( "пытается откусить себе язык!", diff --git a/modular_ss220/keybindings/code/emote_keybinds.dm b/modular_ss220/keybindings/code/emote_keybinds.dm index d48011385c63..84fedcc054b0 100644 --- a/modular_ss220/keybindings/code/emote_keybinds.dm +++ b/modular_ss220/keybindings/code/emote_keybinds.dm @@ -101,6 +101,10 @@ linked_emote = /datum/emote/living/carbon/human/mrowss name = EMOTE_HUMAN_MROWSS +/datum/keybinding/emote/carbon/human/wurble + linked_emote = /datum/emote/living/carbon/human/wurble + name = EMOTE_HUMAN_WURBLE + /datum/keybinding/emote/carbon/human/mrow/New() . = ..() name += " (таяр)"