Skip to content

Commit

Permalink
bork
Browse files Browse the repository at this point in the history
  • Loading branch information
BR54FF committed May 29, 2024
1 parent e3dc8e5 commit d11f1ad
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 20 deletions.
File renamed without changes.
Binary file removed modular_ss220/emotes/audio/bark2.ogg
Binary file not shown.
File renamed without changes.
Binary file removed modular_ss220/emotes/audio/wbark2.ogg
Binary file not shown.
16 changes: 6 additions & 10 deletions modular_ss220/emotes/code/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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'
20 changes: 10 additions & 10 deletions modular_ss220/emotes/code/emote_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 + " "
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit d11f1ad

Please sign in to comment.