From a90b34d1fdfe88d0d869fad6e1c2d3e0c1b84e6a Mon Sep 17 00:00:00 2001 From: Nazsgull Date: Tue, 22 Dec 2020 19:44:19 +0100 Subject: [PATCH] Hierophant staff nerf (#14018) * Hierophant club will now malfunction on station If you are on station and try using it, it will only spawn a few sparks. * Revert "Hierophant club will now malfunction on station" This reverts commit 89d48dbc07c5de6fa008e1b990d2ebb746ca999d. * Nerfs Hierophant club so it cannot be used on station Now if someone uses it onboard it will malfunction * Gets rid of "timerMalfunction" var * Timer refactor Makes only one check for timer, instead of doing two * Removes unused variable * Refactors hierophant to early return As suggested by farie82 Co-authored-by: awdaw --- code/modules/mining/lavaland/loot/hierophant_loot.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm index fc81e6399ae..eddef1ac65a 100644 --- a/code/modules/mining/lavaland/loot/hierophant_loot.dm +++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm @@ -49,8 +49,17 @@ /obj/item/hierophant_club/afterattack(atom/target, mob/user, proximity_flag, click_parameters) ..() + if(world.time < timer) + return + + if(!is_mining_level(user.z))//Will only spawn a few sparks if not on mining z level + timer = world.time + cooldown_time + user.visible_message("[user]'s hierophant club malfunctions!") + do_sparks(5, FALSE, user) + return + var/turf/T = get_turf(target) - if(!T || timer > world.time) + if(!T) return calculate_anger_mod(user) timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown