Добавляет таярам новый эмоут - короткое мурчание (#1751)

## Что этот 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 <[email protected]>
ss220club · Jan 19, 2025 · 4951a62 · 4951a62
1 parent 5915804
commit 4951a62
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 0 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 +=  " (таяр)"