Revert "Merge branch 'master' into Yeehaw"

This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
This commit is contained in:
BlackMajor
2020-01-02 22:06:31 +13:00
parent 30e3edaac1
commit aabb39a364
309 changed files with 1577 additions and 3108 deletions
+5 -3
View File
@@ -11,9 +11,11 @@
var/charge_cost = 30
/obj/item/borg/stun/attack(mob/living/M, mob/living/user)
if(M.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK))
playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK))
playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
if(iscyborg(user))
var/mob/living/silicon/robot/R = user
if(!R.cell.use(charge_cost))