mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-07-20 20:52:52 +01:00
fix: broken emote-activation implants (#8642)
This commit is contained in:
@@ -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?
|
||||
|
||||
Reference in New Issue
Block a user