From 88ad15070bbc87f482ddb7ecd99170cf6e1c96cc Mon Sep 17 00:00:00 2001 From: Ava Date: Mon, 19 Dec 2022 16:49:43 -0500 Subject: [PATCH] fix: broken emote-activation implants (#8642) --- code/modules/emotes/emote_mob.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index b67d95d1d7..a4a1417a0e 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -84,9 +84,6 @@ next_emote = world.time + use_emote.emote_delay use_emote.do_emote(src, message) - for (var/obj/item/implant/I in src) - if (I.implanted) - I.trigger(act, src) #undef EMOTE_REFRESH_SPAM_COOLDOWN @@ -204,6 +201,13 @@ // Specific mob type exceptions below. +/mob/living/carbon/human/emote(act, m_type, message) + . = ..() + for (var/obj/item/organ/external/organ in src.organs) + for (var/obj/item/implant/I in organ.implants) + if (I.implanted) + I.trigger(act, src) + /mob/living/silicon/ai/emote(var/act, var/type, var/message) var/obj/machinery/hologram/holopad/T = src.holo if(T && T.masters[src]) //Is the AI using a holopad?