Fix emote signals (BlueMoon-Labs#1353)

В данную секунду работает.
Kush1Push1 · Oct 31, 2024 · fd45515 · fd45515
1 parent 0f2eb9c
commit fd45515
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)