Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jan 19, 2025
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
673d34c
добавляет таярам короткое мурчание
HNSakt Jan 17, 2025
407286b
добавляет мяуканье в кейбинды должно исправить ошибки
HNSakt Jan 19, 2025
77b1fec
Update modular_ss220/emotes/code/emote_verbs.dm
Gaxeer Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modular_ss220/_defines220/code/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "Моргать"
Expand Down
Binary file added modular_ss220/emotes/audio/mrowss.ogg
View file
Open in desktop
Binary file not shown.
13 changes: 13 additions & 0 deletions modular_ss220/emotes/code/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("слабо")
3 changes: 3 additions & 0 deletions modular_ss220/emotes/code/emote_names.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions modular_ss220/emotes/code/emote_verbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@
set category = "Эмоции"
emote("wbark", intentional = TRUE)

/mob/living/carbon/human/proc/emote_mrowss()
set name = "< " + EMOTE_HUMAN_MROWSS + " >"
set category = "Эмоции"
emote("mrowss", intentional = TRUE)


Gaxeer marked this conversation as resolved.
Show resolved Hide resolved
/// Action Emotes ///
/mob/living/carbon/human/verb/emote_collapse()
set name = "○ " + EMOTE_COLLAPSE + " "
Expand Down
2 changes: 2 additions & 0 deletions modular_ss220/emotes/code/racial_emotes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand All @@ -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)
..()
Expand Down
4 changes: 4 additions & 0 deletions modular_ss220/keybindings/code/emote_keybinds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += " (таяр)"
Expand Down
Loading