Добавление эмоутов

ss220club · Oct 11, 2024 · 93b07e3 · 93b07e3
1 parent fbf7f8d
commit 93b07e3
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 5 deletions.
diff --git a/modular_bandastation/emote_panel/audio/bark.ogg b/modular_bandastation/emote_panel/audio/bark.ogg
diff --git a/modular_bandastation/emote_panel/audio/purr.ogg b/modular_bandastation/emote_panel/audio/purr.ogg
diff --git a/modular_bandastation/emote_panel/audio/wbark.ogg b/modular_bandastation/emote_panel/audio/wbark.ogg
diff --git a/modular_bandastation/emote_panel/code/_emote_defines.dm b/modular_bandastation/emote_panel/code/_emote_defines.dm
@@ -118,6 +118,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_bandastation/emote_panel/code/emote_verbs.dm b/modular_bandastation/emote_panel/code/emote_verbs.dm
@@ -94,6 +94,21 @@
 	set category = "Эмоции"
 	emote("growl", intentional = TRUE)
 
+/mob/living/carbon/human/species/vulpkanin/proc/emote_purr()
+	set name = "▷ " + EMOTE_HUMAN_RUMBLE + " "
+	set category = "Эмоции"
+	emote("purr", intentional = TRUE)
+
+/mob/living/carbon/human/species/vulpkanin/proc/emote_bark()
+	set name = "▷ " + EMOTE_HUMAN_BARK + " "
+	set category = "Эмоции"
+	emote("bark", intentional = TRUE)
+
+/mob/living/carbon/human/species/vulpkanin/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_bandastation/emote_panel/code/emotes.dm b/modular_bandastation/emote_panel/code/emotes.dm
@@ -662,22 +662,51 @@
 	message_mime = "делает вид, что воет."
 	message_param = "воет на %t."
 	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
-	cooldown = 10 SECONDS
-
-/datum/emote/living/carbon/human/vulpkanin/howl/get_sound(mob/living/user)
-	return 'modular_bandastation/emote_panel/audio/howl.ogg'
+	cooldown = 6 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/howl.ogg'
 
 /datum/emote/living/carbon/human/vulpkanin/growl
 	key = "growl"
 	key_third_person = "growls"
 	message = "рычит."
 	message_mime = "бусшумно рычит."
 	message_param = "рычит на %t."
+	cooldown = 2 SECONDS
 	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/vulpkanin/get_sound(mob/living/user)
+/datum/emote/living/carbon/human/vulpkanin/growl/get_sound(mob/living/user)
 	return pick(
 		'modular_bandastation/emote_panel/audio/growl1.ogg',
 		'modular_bandastation/emote_panel/audio/growl2.ogg',
 		'modular_bandastation/emote_panel/audio/growl3.ogg',
 	)
+
+/datum/emote/living/carbon/human/vulpkanin/purr
+	key = "purr"
+	key_third_person = "purrs"
+	message = "урчит."
+	message_param = "урчит на %t."
+	emote_type = EMOTE_AUDIBLE
+	vary = TRUE
+	cooldown = 2 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/purr.ogg'
+
+/datum/emote/living/carbon/human/vulpkanin/bark
+	key = "bark"
+	key_third_person = "bark"
+	message = "гавкает."
+	message_param = "гавкает на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	vary = TRUE
+	cooldown = 2 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/bark.ogg'
+
+/datum/emote/living/carbon/human/vulpkanin/wbark
+	key = "wbark"
+	key_third_person = "wbark"
+	message = "дважды гавкает."
+	message_param = "дважды гавкает на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	vary = TRUE
+	cooldown = 2 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/wbark.ogg'
diff --git a/modular_bandastation/species/code/surgery/organs/internal/vulpkanin_internal.dm b/modular_bandastation/species/code/surgery/organs/internal/vulpkanin_internal.dm
@@ -15,11 +15,17 @@
 	. = ..()
 	add_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_howl)
 	add_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_growl)
+	add_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_purr)
+	add_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_bark)
+	add_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_wbark)
 
 /obj/item/organ/internal/tongue/vulpkanin/on_mob_remove(mob/living/carbon/owner)
 	. = ..()
 	remove_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_howl)
 	remove_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_growl)
+	remove_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_purr)
+	remove_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_bark)
+	remove_verb(owner, /mob/living/carbon/human/species/vulpkanin/proc/emote_wbark)
 
 /obj/item/organ/internal/stomach/vulpkanin
 	hunger_modifier = 1.3