From fd4551531235410281ca1d8176c6eeba717baa03 Mon Sep 17 00:00:00 2001
From: ICE-IS-NICE <73897677+ICE-IS-NICE@users.noreply.github.com>
Date: Thu, 31 Oct 2024 17:49:15 +0300
Subject: [PATCH] Fix emote signals (#1353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

В данную секунду работает.
---
 modular_bluemoon/Fink/code/datums/traits/dna_bm.dm      | 6 +++---
 modular_bluemoon/krashly/code/datums/traits/negative.dm | 6 +++---
 modular_splurt/code/datums/traits/good.dm               | 4 ++--
 modular_splurt/code/modules/mob/emote.dm                | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modular_bluemoon/Fink/code/datums/traits/dna_bm.dm b/modular_bluemoon/Fink/code/datums/traits/dna_bm.dm
index 9fd23788521b..b339d92c2c75 100644
--- a/modular_bluemoon/Fink/code/datums/traits/dna_bm.dm
+++ b/modular_bluemoon/Fink/code/datums/traits/dna_bm.dm
@@ -1734,13 +1734,13 @@
 	if(!QDELETED(owner))
 		UnregisterSignal(owner, list(COMSIG_MOB_DEATH, COMSIG_MOB_EMOTE))
 
-/datum/mutation/human/bm/onelife/proc/get_rid_of_them(mob/user, list/emote_args)
+/datum/mutation/human/bm/onelife/proc/get_rid_of_them(mob/user, datum/emote/emote)
 	if(owner.stat == DEAD)
 		remove_signals()
 		owner.dust(TRUE, TRUE)
 
-/datum/mutation/human/bm/onelife/proc/get_rid_of_them_emote(mob/user, list/emote_args)
-	var/key = GLOB.emote_list[lowertext(emote_args[EMOTE_ACT])]
+/datum/mutation/human/bm/onelife/proc/get_rid_of_them_emote(mob/user, datum/emote/emote)
+	var/key = emote.key
 	if(key == "deathgasp")
 		remove_signals()
 		owner.dust(TRUE, TRUE)
diff --git a/modular_bluemoon/krashly/code/datums/traits/negative.dm b/modular_bluemoon/krashly/code/datums/traits/negative.dm
index 4220e6a0d9ae..74b841d02040 100644
--- a/modular_bluemoon/krashly/code/datums/traits/negative.dm
+++ b/modular_bluemoon/krashly/code/datums/traits/negative.dm
@@ -19,13 +19,13 @@
 	if(!QDELETED(quirk_holder))
 		UnregisterSignal(quirk_holder, list(COMSIG_MOB_DEATH, COMSIG_MOB_EMOTE))
 
-/datum/quirk/onelife/proc/get_rid_of_them(mob/user, list/emote_args)
+/datum/quirk/onelife/proc/get_rid_of_them(mob/user, datum/emote/emote)
 	if(quirk_holder.stat == DEAD)
 		remove_signals()
 		quirk_holder.dust(TRUE, TRUE)
 
-/datum/quirk/onelife/proc/get_rid_of_them_emote(mob/user, list/emote_args)
-	var/key = GLOB.emote_list[lowertext(emote_args[EMOTE_ACT])]
+/datum/quirk/onelife/proc/get_rid_of_them_emote(mob/user, datum/emote/emote)
+	var/key = emote.key
 	if(key == "deathgasp")
 		remove_signals()
 		quirk_holder.dust(TRUE, TRUE)
diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm
index 585604013adf..9625c2fa4862 100644
--- a/modular_splurt/code/datums/traits/good.dm
+++ b/modular_splurt/code/datums/traits/good.dm
@@ -100,11 +100,11 @@
 		sub.dir = turn(get_dir(sub, quirk_holder), pick(-90, 90))
 		sub.emote("blush")
 
-/datum/quirk/dominant_aura/proc/handle_snap(datum/source, list/emote_args)
+/datum/quirk/dominant_aura/proc/handle_snap(datum/source, datum/emote/emote)
 	SIGNAL_HANDLER
 
 	. = FALSE
-	var/key = GLOB.emote_list[lowertext(emote_args[EMOTE_ACT])]
+	var/key = emote.key
 	if(TIMER_COOLDOWN_CHECK(quirk_holder, COOLDOWN_DOMINANT_SNAP) || !findtext(key, "snap"))
 		return
 	for(var/mob/living/carbon/human/sub in hearers(DOMINANT_DETECT_RANGE, quirk_holder))
diff --git a/modular_splurt/code/modules/mob/emote.dm b/modular_splurt/code/modules/mob/emote.dm
index a8caa144f984..32802484a784 100644
--- a/modular_splurt/code/modules/mob/emote.dm
+++ b/modular_splurt/code/modules/mob/emote.dm
@@ -1,3 +1,4 @@
 /mob/emote(act, m_type, message, intentional)
 	. = ..()
-	SEND_SIGNAL(src, COMSIG_MOB_EMOTE, args)
+	//SPLURT added signal sending in /mob/proc/emote (emote.dm)
+	//SEND_SIGNAL(src, COMSIG_MOB_EMOTE, args)