Заменяет звуки вульпам и добавляет новый

ss220club · Feb 2, 2025 · fe55ba6 · fe55ba6
1 parent 63fafa2
commit fe55ba6
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 1 deletion.
diff --git a/modular_ss220/_defines220/code/emote.dm b/modular_ss220/_defines220/code/emote.dm
@@ -124,6 +124,7 @@
 #define EMOTE_HUMAN_MEOW			"Мяукнуть"
 #define EMOTE_HUMAN_MROW			"Мяукнуть раздражённо"
 #define EMOTE_HUMAN_MROWSS			"Мурчать коротко"
+#define EMOTE_HUMAN_WURBLE			"Приглушенно рычать"
 
 /// Carbon Emotes
 #define EMOTE_CARBON_BLINK 			"Моргать"

diff --git a/modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg b/modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg
diff --git a/modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg b/modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg
diff --git a/modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg b/modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg
diff --git a/modular_ss220/emotes/audio/vulpkanin/wurble.ogg b/modular_ss220/emotes/audio/vulpkanin/wurble.ogg
diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm
@@ -457,3 +457,16 @@
 	cooldown = 5 SECONDS
 	volume = 50
 	muzzled_noises = list("слабо")
+
+/datum/emote/living/carbon/human/wurble
+	key = "wurble"
+	key_third_person = "wurble"
+	message = "приглушенно рычит"
+	message_param = "приглушенно рычит на %t."
+	sound = 'modular_ss220/emotes/audio/vulpkanin/wurble.ogg'
+	species_type_whitelist_typecache = list(/datum/species/vulpkanin)
+	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
@@ -467,6 +467,9 @@
 /datum/emote/living/carbon/human/tajaran/mrowss
 	name = EMOTE_HUMAN_MROWSS
 
+/datum/emote/living/carbon/human/vulpkanin/wurble
+	name = EMOTE_HUMAN_WURBLE
+
 /// 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
@@ -99,6 +99,12 @@
 	set category = "Эмоции"
 	emote("mrowss", intentional = TRUE)
 
+/mob/living/carbon/human/proc/emote_wurble()
+	set name = "< " + EMOTE_HUMAN_WURBLE + " >"
+	set category = "Эмоции"
+	emote("wurble", 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
@@ -6,6 +6,7 @@
 	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
+	H.verbs |= /mob/living/carbon/human/proc/emote_wurble
 
 /datum/species/vulpkanin/on_species_loss(mob/living/carbon/human/H)
 	..()
@@ -15,6 +16,7 @@
 	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
+	H.verbs -= /mob/living/carbon/human/proc/emote_wurble
 
 /datum/species/diona/on_species_gain(mob/living/carbon/human/H)
 	..()

diff --git a/modular_ss220/emotes/code/species.dm b/modular_ss220/emotes/code/species.dm
@@ -322,7 +322,12 @@
 			"r" = list("r", "rr", "rrr"),
 			"р" = list("р", "рр", "ррр"))
 	autohiss_exempt = list("Canilunzt")
-
+	male_scream_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg'
+	female_scream_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg'
+	male_giggle_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg'
+	female_giggle_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg'
+	male_laugh_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg'
+	female_laugh_sound = 'modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg'
 	scream_verb = "скулит"
 	suicide_messages = list(
 		"пытается откусить себе язык!",

diff --git a/modular_ss220/keybindings/code/emote_keybinds.dm b/modular_ss220/keybindings/code/emote_keybinds.dm
@@ -101,6 +101,10 @@
 	linked_emote = /datum/emote/living/carbon/human/mrowss
 	name = EMOTE_HUMAN_MROWSS
 
+/datum/keybinding/emote/carbon/human/wurble
+	linked_emote = /datum/emote/living/carbon/human/wurble
+	name = EMOTE_HUMAN_WURBLE
+
 /datum/keybinding/emote/carbon/human/mrow/New()
 	. = ..()
 	name +=  " (таяр)"