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

Заменяет вульпам звуки делая их менее рескином хуманов, и добавляет новый эмоут. #1780

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Заменяет вульпам звуки делая их менее рескином хуманов, и добавляет новый эмоут. #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe55ba6
Заменяет звуки вульпам и добавляет новый
HNSakt Feb 2, 2025
4651cd3
меняет глагол крика
HNSakt Feb 2, 2025
0561603
заменяет звуки с звук гиены на звук лисы(вурбл теперь не урчание)
HNSakt Feb 10, 2025
ff0fb04
заменяет смех и хихи на звуки красной лисы вместо арктической
HNSakt Feb 10, 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 @@ -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 "Моргать"
Expand Down
Binary file added modular_ss220/emotes/audio/vulpkanin/vulp_giggle.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/vulpkanin/vulp_laugh.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/vulpkanin/vulp_scream.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/vulpkanin/wurble.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 @@ -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("слабо")
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 @@ -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
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 @@ -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 + " "
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 @@ -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)
..()
Expand All @@ -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)
..()
Expand Down
9 changes: 7 additions & 2 deletions modular_ss220/emotes/code/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,13 @@
"r" = list("r", "rr", "rrr"),
"р" = list("р", "рр", "ррр"))
autohiss_exempt = list("Canilunzt")

scream_verb = "скулит"
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(
"пытается откусить себе язык!",
"выдавливает когтями свои глазницы!",
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 @@ -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 += " (таяр)"
Expand Down