From 4951a6233b7352c72835ecb468202960ccfe3b36 Mon Sep 17 00:00:00 2001 From: HNSakt <180228575+HNSakt@users.noreply.github.com> Date: Sun, 19 Jan 2025 13:29:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D1=82=D0=B0=D1=8F=D1=80=D0=B0=D0=BC=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=8D=D0=BC=D0=BE=D1=83=D1=82=20-?= =?UTF-8?q?=20=D0=BA=D0=BE=D1=80=D0=BE=D1=82=D0=BA=D0=BE=D0=B5=20=D0=BC?= =?UTF-8?q?=D1=83=D1=80=D1=87=D0=B0=D0=BD=D0=B8=D0=B5=20(#1751)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Добавляет таярам новое мурчание , короткое мурчание портированное с ТГ нашего. ## Почему это хорошо для игры Больше расовых эмоутов = лучше. ## Изображения изменений ## Тестирование Зашел на локалку и мурчал , вроде ничего не взорвалось и никто не умер. ## Changelog :cl: Hans add: Портировал с ТГ короткое мурчание для таяр. soundadd: Портировал с ТГ звук короткого мурчания. /:cl: ## Summary by Sourcery New Features: - Added a new short purr emote for the Tajara species. --------- Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com> --- modular_ss220/_defines220/code/emote.dm | 1 + modular_ss220/emotes/audio/mrowss.ogg | Bin 0 -> 13597 bytes modular_ss220/emotes/code/emote.dm | 13 +++++++++++++ modular_ss220/emotes/code/emote_names.dm | 3 +++ modular_ss220/emotes/code/emote_verbs.dm | 5 +++++ modular_ss220/emotes/code/racial_emotes.dm | 2 ++ .../keybindings/code/emote_keybinds.dm | 4 ++++ 7 files changed, 28 insertions(+) create mode 100644 modular_ss220/emotes/audio/mrowss.ogg 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 0000000000000000000000000000000000000000..dd37f0a12991b9ecf83c9c67a54ebe90f533c183 GIT binary patch literal 13597 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" + 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 += " (таяр)"