From b0760b9b3377e21c76ea79ab36e043a2c068ab12 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 18 May 2017 12:07:02 -0500 Subject: [PATCH] Fixes not being able to cancel Geis and being able to cancel Volt Void (#998) --- .../game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm index fd18393898..57a68078df 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm @@ -26,7 +26,7 @@ ranged_mousepointer = 'icons/effects/geis_target.dmi' /obj/effect/proc_holder/slab/geis/InterceptClickOn(mob/living/caller, params, atom/target) - if(target == slab || ..()) + if(..()) return TRUE var/turf/T = ranged_ability_user.loc @@ -148,7 +148,7 @@ ranged_mousepointer = 'icons/effects/volt_target.dmi' /obj/effect/proc_holder/slab/volt/InterceptClickOn(mob/living/caller, params, atom/target) - if(..()) + if(target == slab || ..()) //we can't cancel return TRUE var/turf/T = ranged_ability_user.loc