cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15591 from Lobachevskiy/telebaton-fix

Browse Source 
Fix police and telebatons ignoring shields
This commit is contained in:
KorPhaeron
2016-02-18 19:49:54 -06:00
parent 377838f9e5 43207c3070
commit 1ec9f757cc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/misc.dm
+4
View File
@@ -56,6 +56,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]", src, MELEE_ATTACK))
return
playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
target.Weaken(3)
add_logs(user, target, "stunned", src)