From a81a283f8b5fed861998a13a72f03d5e8aad1bd6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 27 Feb 2021 21:30:17 +0100 Subject: [PATCH] [MIRROR] Fixes null rod's heretic rune dispel (#3698) * Fixes null rod's heretic rune dispel (#57221) The chaplain's null rod can now dispel the heretic's transmutation rune. Note that as with with the Nar'Sie rune, you must stand on it. * Fixes null rod's heretic rune dispel Co-authored-by: Gurkenglas --- code/modules/antagonists/eldritch_cult/eldritch_effects.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index e80b9550774..00fff8700d3 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -26,9 +26,11 @@ if(!is_in_use) INVOKE_ASYNC(src, .proc/activate , user) -/obj/effect/eldritch/attacked_by(obj/item/I, mob/living/user) +/obj/effect/eldritch/attackby(obj/item/I, mob/living/user) . = ..() if(istype(I,/obj/item/nullrod)) + user.say("BEGONE FOUL MAGIKS!!", forced = "nullrod") + to_chat(user, "You disrupt the magic of [src] with [I].") qdel(src) /obj/effect/eldritch/proc/activate(mob/living/user)