Fixes a Few Non-Respected Shields

This commit is contained in:
Fox-McCloud
2016-07-02 02:42:25 -04:00
parent 61da4ddefb
commit d98af32ce1
3 changed files with 15 additions and 0 deletions
@@ -132,6 +132,11 @@
/obj/item/weapon/melee/baton/proc/baton_stun(mob/living/L, mob/user)
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.check_shields(0, "[user]'s [name]")) //No message; check_shields() handles that
playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
return 0
user.lastattacked = L
L.lastattacker = user
@@ -51,6 +51,10 @@
if(!isrobot(target)) return
else
if(cooldown <= 0)
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.check_shields(0, "[user]'s [name]"))
return
playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
target.Weaken(3)
add_logs(target, user, "stunned", object="[src]")