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 89d48dbc07.

* 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 <uo251631@uniovi.es>
This commit is contained in:
Nazsgull
2020-12-22 19:44:19 +01:00
committed by GitHub
parent 6d2c211688
commit a90b34d1fd
@@ -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("<span class='danger'>[user]'s hierophant club malfunctions!</span>")
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