diff --git a/modular_ss220/_defines220/code/emote.dm b/modular_ss220/_defines220/code/emote.dm index 31ee33737fbd..d22543b1c4a5 100644 --- a/modular_ss220/_defines220/code/emote.dm +++ b/modular_ss220/_defines220/code/emote.dm @@ -119,6 +119,8 @@ #define EMOTE_HUMAN_WIGGLES "Шевелить усиками" #define EMOTE_HUMAN_WHIPS "Хлестать хвостом" #define EMOTE_HUMAN_WHIP "Ударить хвостом" +#define EMOTE_HUMAN_BARK "Гавкнуть" +#define EMOTE_HUMAN_WBARK "Дважды гавкнуть" /// Carbon Emotes #define EMOTE_CARBON_BLINK "Моргать" diff --git a/modular_ss220/emotes/_emotes.dm b/modular_ss220/emotes/_emotes.dm index 00d063c6b095..f61dac15cda6 100644 --- a/modular_ss220/emotes/_emotes.dm +++ b/modular_ss220/emotes/_emotes.dm @@ -1,4 +1,4 @@ /datum/modpack/emotes name = "Панель эмоций" desc = "Добавляет панель эмоций в меню. Добавляет опциональное ТГУИ меню эмоций в IC. Добавляет новые эмоции." - author = "furior, larentoun, Aylong, PhantomRU" + author = "furior, larentoun, Aylong, PhantomRU, BR54FF" diff --git a/modular_ss220/emotes/audio/bark.ogg b/modular_ss220/emotes/audio/bark.ogg new file mode 100644 index 000000000000..62a8535b628c Binary files /dev/null and b/modular_ss220/emotes/audio/bark.ogg differ diff --git a/modular_ss220/emotes/audio/wbark.ogg b/modular_ss220/emotes/audio/wbark.ogg new file mode 100644 index 000000000000..e37005eeb9ab Binary files /dev/null and b/modular_ss220/emotes/audio/wbark.ogg differ diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm index 244d048f0145..d30e71f2e0cb 100644 --- a/modular_ss220/emotes/code/emote.dm +++ b/modular_ss220/emotes/code/emote.dm @@ -392,3 +392,27 @@ return pick( 'modular_ss220/emotes/audio/skrell/anger_1.ogg', 'modular_ss220/emotes/audio/skrell/anger_2.ogg') + +/datum/emote/living/carbon/human/bark + key = "bark" + key_third_person = "bark" + message = "гавкает." + message_param = "гавкает на %t." + emote_type = EMOTE_AUDIBLE + age_based = TRUE + vary = TRUE + volume = 30 + species_type_whitelist_typecache = list(/datum/species/vulpkanin) + sound = 'modular_ss220/emotes/audio/bark.ogg' + +/datum/emote/living/carbon/human/wbark + key = "wbark" + key_third_person = "wbark" + message = "дважды гавкает." + message_param = "дважды гавкает на %t." + emote_type = EMOTE_AUDIBLE + age_based = TRUE + vary = TRUE + volume = 30 + species_type_whitelist_typecache = list(/datum/species/vulpkanin) + sound = 'modular_ss220/emotes/audio/wbark.ogg' diff --git a/modular_ss220/emotes/code/emote_names.dm b/modular_ss220/emotes/code/emote_names.dm index 0d476902754e..427c2a949485 100644 --- a/modular_ss220/emotes/code/emote_names.dm +++ b/modular_ss220/emotes/code/emote_names.dm @@ -364,6 +364,12 @@ /datum/emote/living/carbon/human/monkey/scratch name = EMOTE_HUMAN_SCRATCH +/datum/emote/living/carbon/human/bark + name = EMOTE_HUMAN_BARK + +/datum/emote/living/carbon/human/wbark + name = EMOTE_HUMAN_WBARK + /// Emote Silicon /datum/emote/living/silicon/scream diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm index 5ec214e40df7..938723c7a892 100644 --- a/modular_ss220/emotes/code/emote_verbs.dm +++ b/modular_ss220/emotes/code/emote_verbs.dm @@ -84,6 +84,16 @@ set category = "Эмоции" emote("clap", intentional = TRUE) +/mob/living/carbon/human/proc/emote_bark() + set name = "▷ " + EMOTE_HUMAN_BARK + " " + set category = "Эмоции" + emote("bark", intentional = TRUE) + +/mob/living/carbon/human/proc/emote_wbark() + set name = "▷ " + EMOTE_HUMAN_WBARK + " " + set category = "Эмоции" + emote("wbark", 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 5417ac7b3738..186a9f1ec7da 100644 --- a/modular_ss220/emotes/code/racial_emotes.dm +++ b/modular_ss220/emotes/code/racial_emotes.dm @@ -4,6 +4,8 @@ H.verbs |= /mob/living/carbon/human/proc/emote_swag H.verbs |= /mob/living/carbon/human/proc/emote_howl 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 /datum/species/vulpkanin/on_species_loss(mob/living/carbon/human/H) ..() @@ -11,6 +13,8 @@ H.verbs -= /mob/living/carbon/human/proc/emote_swag H.verbs -= /mob/living/carbon/human/proc/emote_howl 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 /datum/species/diona/on_species_gain(mob/living/carbon/human/H) ..() diff --git a/modular_ss220/keybindings/_keybindings.dm b/modular_ss220/keybindings/_keybindings.dm index 289a15b6bdf5..975ecf7c484b 100644 --- a/modular_ss220/keybindings/_keybindings.dm +++ b/modular_ss220/keybindings/_keybindings.dm @@ -1,4 +1,4 @@ /datum/modpack/keybindings name = "Keybindings" desc = "Заменяет значения по-умолчанию хоткеев на SS220" - author = "larentoun" + author = "larentoun, BR54FF" diff --git a/modular_ss220/keybindings/code/emote_keybinds.dm b/modular_ss220/keybindings/code/emote_keybinds.dm index c68d43062852..d397c3c52875 100644 --- a/modular_ss220/keybindings/code/emote_keybinds.dm +++ b/modular_ss220/keybindings/code/emote_keybinds.dm @@ -73,6 +73,14 @@ linked_emote = /datum/emote/exercise/pushup name = EMOTE_PUSHUP +/datum/keybinding/emote/carbon/human/bark + linked_emote = /datum/emote/living/carbon/human/bark + name = EMOTE_HUMAN_BARK + +/datum/keybinding/emote/carbon/human/wbark + linked_emote = /datum/emote/living/carbon/human/wbark + name = EMOTE_HUMAN_WBARK + /datum/keybinding/emote/carbon/human/drask_talk/New() ..() name += " (драск)"