From 9bca5ac7b2687c873ef8e3423f8a97ad41256b7f Mon Sep 17 00:00:00 2001 From: Coolrune206 <71326864+Coolrune206@users.noreply.github.com> Date: Mon, 12 Dec 2022 07:16:28 +1000 Subject: [PATCH] Prevents eternal Rod Form (#19881) * makes rod form not work while jaunting * Revert "makes rod form not work while jaunting" This reverts commit fb1be0f48237a0dd56980b823319c2e181819df6. * prevents eternal rod form * hal9000 review --- code/datums/spells/rod_form.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/spells/rod_form.dm b/code/datums/spells/rod_form.dm index 48c863f19e0..3670b320b8e 100644 --- a/code/datums/spells/rod_form.dm +++ b/code/datums/spells/rod_form.dm @@ -17,6 +17,10 @@ return new /datum/spell_targeting/self /obj/effect/proc_holder/spell/rod_form/cast(list/targets,mob/user = usr) + if(get_turf(user) != user.loc) + to_chat(user, "You cannot summon a rod in the ether, the spell fizzles out!") + revert_cast() + return FALSE for(var/mob/living/M in targets) var/turf/start = get_turf(M) var/obj/effect/immovablerod/wizard/W = new(start, get_ranged_target_turf(M, M.dir, (15 + spell_level * 3)), rod_delay)