Merge pull request #252 from Regen1/Combat-borgs

Combat borgs + various tweaks
This commit is contained in:
ZomgPonies
2014-06-18 06:01:46 -04:00
4 changed files with 89 additions and 30 deletions
@@ -56,8 +56,9 @@ obj/item/weapon/gun/energy/laser/retro
if(isrobot(src.loc))
var/mob/living/silicon/robot/R = src.loc
if(R && R.cell)
R.cell.use(100)
R.cell.use(500)
in_chamber = new/obj/item/projectile/beam(src)
fire_delay = 12
return 1
return 0