diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm index e2025ae166c9..a001ab354718 100644 --- a/modular_splurt/code/datums/traits/good.dm +++ b/modular_splurt/code/datums/traits/good.dm @@ -92,12 +92,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])] - if(TIMER_COOLDOWN_CHECK(quirk_holder, COOLDOWN_DOMINANT_SNAP) || !findtext(key, "snap")) + if(TIMER_COOLDOWN_CHECK(quirk_holder, COOLDOWN_DOMINANT_SNAP) || !findtext(emote.key, "snap")) return for(var/mob/living/carbon/human/sub in hearers(DOMINANT_DETECT_RANGE, quirk_holder)) if(!sub.has_quirk(/datum/quirk/well_trained) || (sub == quirk_holder)) @@ -108,7 +107,7 @@ good_x = "boy" if(FEMALE) good_x = "girl" - switch(key) + switch(emote.key) if("snap") sub.dir = get_dir(sub, quirk_holder) sub.emote(pick("blush", "pant")) diff --git a/modular_splurt/code/modules/mob/emote.dm b/modular_splurt/code/modules/mob/emote.dm deleted file mode 100644 index a8caa144f984..000000000000 --- a/modular_splurt/code/modules/mob/emote.dm +++ /dev/null @@ -1,3 +0,0 @@ -/mob/emote(act, m_type, message, intentional) - . = ..() - SEND_SIGNAL(src, COMSIG_MOB_EMOTE, args) diff --git a/tgstation.dme b/tgstation.dme index 105d49fb44bf..7c0826cab877 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4922,7 +4922,6 @@ #include "modular_splurt\code\modules\mining\equipment\kinetic_crusher.dm" #include "modular_splurt\code\modules\mining\equipment\machine_vending.dm" #include "modular_splurt\code\modules\mining\lavaland\necropolis_chests.dm" -#include "modular_splurt\code\modules\mob\emote.dm" #include "modular_splurt\code\modules\mob\femclaw.dm" #include "modular_splurt\code\modules\mob\inventory.dm" #include "modular_splurt\code\modules\mob\mob.dm"