Merge pull request #8094 from Trilbyspaceclone/patch-75

[MIRROR] Watcher's Wing No Longer Perma-Disarms #41708
This commit is contained in:
deathride58
2019-03-08 20:48:40 -05:00
committed by GitHub
@@ -239,10 +239,10 @@
if(ishostile(target))
var/mob/living/simple_animal/hostile/H = target
if(H.ranged) //briefly delay ranged attacks
if(H.ranged_cooldown_time >= world.time)
H.ranged_cooldown_time += bonus_value
if(H.ranged_cooldown >= world.time)
H.ranged_cooldown += bonus_value
else
H.ranged_cooldown_time = bonus_value + world.time
H.ranged_cooldown = bonus_value + world.time
//magmawing watcher
/obj/item/crusher_trophy/blaster_tubes/magma_wing