From 487926c7c7dc734667be2bbe6b3c54beb35a3892 Mon Sep 17 00:00:00 2001 From: KasaAlex <98211957+KasaAlex@users.noreply.github.com> Date: Sat, 14 Sep 2024 08:53:19 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=D0=B0=20=D1=88=D0=B8=D0=BF=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=83=D0=BD=D0=B0=D1=82=D1=85=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/emotes/code/emote_verbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm index 12f0ce638ba6..46ec2cb3d4b5 100644 --- a/modular_ss220/emotes/code/emote_verbs.dm +++ b/modular_ss220/emotes/code/emote_verbs.dm @@ -391,7 +391,7 @@ /mob/living/carbon/human/proc/emote_unathi_hiss() set name = "< " + EMOTE_HUMAN_HISS + " >" set category = "Эмоции" - emote("uhiss", intentional = TRUE) + emote("hiss", intentional = TRUE) /mob/living/carbon/human/proc/emote_quill() set name = "< " + EMOTE_HUMAN_QUILL + " >" From a190c7571aa4817754583d4ede2c7d61ff1731c9 Mon Sep 17 00:00:00 2001 From: KasaAlex <98211957+KasaAlex@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:10:48 +0000 Subject: [PATCH 2/4] Unathi hiss fix v2 --- modular_ss220/emotes/code/emote_verbs.dm | 8 ++++---- modular_ss220/emotes/code/racial_emotes.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm index 46ec2cb3d4b5..5090c4cce60a 100644 --- a/modular_ss220/emotes/code/emote_verbs.dm +++ b/modular_ss220/emotes/code/emote_verbs.dm @@ -388,10 +388,10 @@ set category = "Эмоции" emote("rumble", intentional = TRUE) -/mob/living/carbon/human/proc/emote_unathi_hiss() - set name = "< " + EMOTE_HUMAN_HISS + " >" - set category = "Эмоции" - emote("hiss", intentional = TRUE) +// /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_quill() set name = "< " + EMOTE_HUMAN_QUILL + " >" diff --git a/modular_ss220/emotes/code/racial_emotes.dm b/modular_ss220/emotes/code/racial_emotes.dm index a7bf7ec35e31..d70bcac25f68 100644 --- a/modular_ss220/emotes/code/racial_emotes.dm +++ b/modular_ss220/emotes/code/racial_emotes.dm @@ -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 @@ -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 From c158b0868209da7cb2875ef1e70b7d885226f651 Mon Sep 17 00:00:00 2001 From: KasaAlex <98211957+KasaAlex@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:13:15 +0000 Subject: [PATCH 3/4] Deleted unused strings --- modular_ss220/emotes/code/emote_verbs.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm index 5090c4cce60a..92a7c8636c42 100644 --- a/modular_ss220/emotes/code/emote_verbs.dm +++ b/modular_ss220/emotes/code/emote_verbs.dm @@ -388,10 +388,6 @@ set category = "Эмоции" emote("rumble", intentional = TRUE) -// /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_quill() set name = "< " + EMOTE_HUMAN_QUILL + " >" From d92df2c4eeafa5e701060fb528f0fa91cf5f7234 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Sat, 14 Sep 2024 16:24:14 +0300 Subject: [PATCH 4/4] Update modular_ss220/emotes/code/emote_verbs.dm --- modular_ss220/emotes/code/emote_verbs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm index 92a7c8636c42..a31fb8c4486f 100644 --- a/modular_ss220/emotes/code/emote_verbs.dm +++ b/modular_ss220/emotes/code/emote_verbs.dm @@ -388,7 +388,6 @@ set category = "Эмоции" emote("rumble", intentional = TRUE) - /mob/living/carbon/human/proc/emote_quill() set name = "< " + EMOTE_HUMAN_QUILL + " >" set category = "Эмоции"