Merge pull request #5592 from TheDZD/leapnerf

Makes Shields Counter Xeno Leap More Effectively
This commit is contained in:
Fox McCloud
2016-09-03 20:22:45 -04:00
committed by GitHub
3 changed files with 12 additions and 7 deletions
@@ -96,7 +96,7 @@
var/blocked = 0
if(ishuman(A))
var/mob/living/carbon/human/H = A
if(H.check_shields(90, "the [name]", src, attack_type = THROWN_PROJECTILE_ATTACK))
if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
blocked = 1
if(!blocked)
L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
@@ -107,6 +107,8 @@
L.Weaken(5)
sleep(2)//Runtime prevention (infinite bump() calls on hulks)
step_towards(src,L)
else
weakened = 2
toggle_leap(0)
pounce_cooldown = !pounce_cooldown
@@ -168,4 +170,4 @@
src.throwing = 0
return 1
return 1