Merge pull request #9856 from Ghommie/Ghommie-cit367

This commit is contained in:
Lin
2020-10-02 00:49:56 -03:00
committed by Dip
parent 20c30a15d1
commit ac25b449f7
39 changed files with 675 additions and 588 deletions
@@ -479,11 +479,9 @@ Congratulations! You are now trained for invasive xenobiology research!"}
user.do_attack_animation(L)
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
return 0
if(L.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
playsound(L, 'sound/weapons/genhit.ogg', 50, TRUE)
return FALSE
switch (mode)
if(BATON_STUN)