diff --git a/modular_ss220/_defines220/code/emote.dm b/modular_ss220/_defines220/code/emote.dm index 2b8bf2c2405f..c85d5c941aa4 100644 --- a/modular_ss220/_defines220/code/emote.dm +++ b/modular_ss220/_defines220/code/emote.dm @@ -123,6 +123,7 @@ #define EMOTE_HUMAN_WBARK "Дважды гавкнуть" #define EMOTE_HUMAN_MEOW "Мяукнуть" #define EMOTE_HUMAN_MROW "Мяукнуть раздражённо" +#define EMOTE_HUMAN_MROWSS "Мурчать коротко" /// Carbon Emotes #define EMOTE_CARBON_BLINK "Моргать" diff --git a/modular_ss220/emotes/audio/mrowss.ogg b/modular_ss220/emotes/audio/mrowss.ogg new file mode 100644 index 000000000000..dd37f0a12991 Binary files /dev/null and b/modular_ss220/emotes/audio/mrowss.ogg differ diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm index 4a44ab057058..7cbd9b8e7f2c 100644 --- a/modular_ss220/emotes/code/emote.dm +++ b/modular_ss220/emotes/code/emote.dm @@ -444,3 +444,16 @@ cooldown = 10 SECONDS volume = 70 muzzled_noises = list("слабо") + +/datum/emote/living/carbon/human/mrowss + key = "mrowss" + key_third_person = "mrowss" + message = "мурчит коротко" + message_param = "коротко мурчит на %t." + sound = 'modular_ss220/emotes/audio/mrowss.ogg' + species_type_whitelist_typecache = list(/datum/species/tajaran) + 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 f3fdcc5be3ec..11f37049a51c 100644 --- a/modular_ss220/emotes/code/emote_names.dm +++ b/modular_ss220/emotes/code/emote_names.dm @@ -464,6 +464,9 @@ /datum/emote/living/carbon/human/tajaran/mrow name = EMOTE_HUMAN_MROW +/datum/emote/living/carbon/human/tajaran/mrowss + name = EMOTE_HUMAN_MROWSS + /// 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 96651d78e930..18e9058cd3bb 100644 --- a/modular_ss220/emotes/code/emote_verbs.dm +++ b/modular_ss220/emotes/code/emote_verbs.dm @@ -94,6 +94,11 @@ set category = "Эмоции" emote("wbark", intentional = TRUE) +/mob/living/carbon/human/proc/emote_mrowss() + set name = "< " + EMOTE_HUMAN_MROWSS + " >" + set category = "Эмоции" + emote("mrowss", 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 f50797fd20c8..4d66e42b7c7b 100644 --- a/modular_ss220/emotes/code/racial_emotes.dm +++ b/modular_ss220/emotes/code/racial_emotes.dm @@ -109,6 +109,7 @@ H.verbs |= /mob/living/carbon/human/proc/emote_hiss H.verbs |= /mob/living/carbon/human/proc/emote_meow H.verbs |= /mob/living/carbon/human/proc/emote_mrow + H.verbs |= /mob/living/carbon/human/proc/emote_mrowss /datum/species/tajaran/on_species_loss(mob/living/carbon/human/H) ..() @@ -119,6 +120,7 @@ H.verbs -= /mob/living/carbon/human/proc/emote_hiss H.verbs -= /mob/living/carbon/human/proc/emote_meow H.verbs -= /mob/living/carbon/human/proc/emote_mrow + H.verbs -= /mob/living/carbon/human/proc/emote_mrowss /datum/species/unathi/on_species_gain(mob/living/carbon/human/H) ..() diff --git a/modular_ss220/keybindings/code/emote_keybinds.dm b/modular_ss220/keybindings/code/emote_keybinds.dm index 5ce1af0f6202..d48011385c63 100644 --- a/modular_ss220/keybindings/code/emote_keybinds.dm +++ b/modular_ss220/keybindings/code/emote_keybinds.dm @@ -97,6 +97,10 @@ linked_emote = /datum/emote/living/carbon/human/mrow name = EMOTE_HUMAN_MROW +/datum/keybinding/emote/carbon/human/mrowss + linked_emote = /datum/emote/living/carbon/human/mrowss + name = EMOTE_HUMAN_MROWSS + /datum/keybinding/emote/carbon/human/mrow/New() . = ..() name += " (таяр)"