diff --git a/modular_ss220/emotes/audio/bark1.ogg b/modular_ss220/emotes/audio/bark.ogg similarity index 100% rename from modular_ss220/emotes/audio/bark1.ogg rename to modular_ss220/emotes/audio/bark.ogg diff --git a/modular_ss220/emotes/audio/bark2.ogg b/modular_ss220/emotes/audio/bark2.ogg deleted file mode 100644 index e0e77281d824..000000000000 Binary files a/modular_ss220/emotes/audio/bark2.ogg and /dev/null differ diff --git a/modular_ss220/emotes/audio/wbark1.ogg b/modular_ss220/emotes/audio/wbark.ogg similarity index 100% rename from modular_ss220/emotes/audio/wbark1.ogg rename to modular_ss220/emotes/audio/wbark.ogg diff --git a/modular_ss220/emotes/audio/wbark2.ogg b/modular_ss220/emotes/audio/wbark2.ogg deleted file mode 100644 index 909a66f2eaf2..000000000000 Binary files a/modular_ss220/emotes/audio/wbark2.ogg and /dev/null differ diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm index c7a737bffafa..d30e71f2e0cb 100644 --- a/modular_ss220/emotes/code/emote.dm +++ b/modular_ss220/emotes/code/emote.dm @@ -400,12 +400,10 @@ message_param = "гавкает на %t." emote_type = EMOTE_AUDIBLE age_based = TRUE + vary = TRUE + volume = 30 species_type_whitelist_typecache = list(/datum/species/vulpkanin) - -/datum/emote/living/carbon/human/bark/get_sound(mob/living/user) - return pick( - 'modular_ss220/emotes/audio/bark1.ogg', - 'modular_ss220/emotes/audio/bark2.ogg') + sound = 'modular_ss220/emotes/audio/bark.ogg' /datum/emote/living/carbon/human/wbark key = "wbark" @@ -414,9 +412,7 @@ message_param = "дважды гавкает на %t." emote_type = EMOTE_AUDIBLE age_based = TRUE + vary = TRUE + volume = 30 species_type_whitelist_typecache = list(/datum/species/vulpkanin) - -/datum/emote/living/carbon/human/wbark/get_sound(mob/living/user) - return pick( - 'modular_ss220/emotes/audio/wbark1.ogg', - 'modular_ss220/emotes/audio/wbark2.ogg') + sound = 'modular_ss220/emotes/audio/wbark.ogg' diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm index b9566f8230d4..a686497631d6 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 + " " @@ -503,16 +513,6 @@ set category = "Эмоции" emote("hem", 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) - /// Слишком переполненное меню, убираю то что легче написать чем искать. /// /* /mob/living/carbon/human/verb/emote_deathgasp()