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.

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

Попытка фикса шипения унатхов #1507

Merged
merged 4 commits into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
8 changes: 4 additions & 4 deletions modular_ss220/emotes/code/emote_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,10 @@
set category = "Эмоции"
emote("rumble", intentional = TRUE)

m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
/mob/living/carbon/human/proc/emote_unathi_hiss()
set name = "< " + EMOTE_HUMAN_HISS + " >"
set category = "Эмоции"
emote("uhiss", intentional = TRUE)
// /mob/living/carbon/human/proc/emote_unathi_hiss()
KasaAlex marked this conversation as resolved.
Show resolved Hide resolved
// set name = "< " + EMOTE_HUMAN_HISS + " >"
// set category = "Эмоции"
// emote("uhiss", intentional = TRUE)

/mob/living/carbon/human/proc/emote_quill()
set name = "< " + EMOTE_HUMAN_QUILL + " >"
Expand Down
4 changes: 2 additions & 2 deletions modular_ss220/emotes/code/racial_emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
..()
H.verbs |= /mob/living/carbon/human/proc/emote_wag
H.verbs |= /mob/living/carbon/human/proc/emote_swag
H.verbs |= /mob/living/carbon/human/proc/emote_unathi_hiss
H.verbs |= /mob/living/carbon/human/proc/emote_hiss
H.verbs |= /mob/living/carbon/human/proc/emote_roar
H.verbs |= /mob/living/carbon/human/proc/emote_threat
H.verbs |= /mob/living/carbon/human/proc/emote_whip
Expand All @@ -133,7 +133,7 @@
..()
H.verbs -= /mob/living/carbon/human/proc/emote_wag
H.verbs -= /mob/living/carbon/human/proc/emote_swag
H.verbs -= /mob/living/carbon/human/proc/emote_unathi_hiss
H.verbs -= /mob/living/carbon/human/proc/emote_hiss
H.verbs -= /mob/living/carbon/human/proc/emote_roar
H.verbs -= /mob/living/carbon/human/proc/emote_threat
H.verbs -= /mob/living/carbon/human/proc/emote_whip
Expand Down
Loading