From c27676e0e19c577a381d5efead36edef52ed7229 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Wed, 13 Jun 2012 22:50:34 +0000 Subject: [PATCH] Fix for borg batons running out of charge. Thanks Invisty for reporting this. They now consume 50 charge per stun. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3814 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/stunbaton.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 7a27c94c4ff..fae334203db 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -67,7 +67,12 @@ H.apply_effect(10, STUTTER, 0) user.lastattacked = M H.lastattacker = user - charges-- + if(isrobot(src.loc)) + var/mob/living/silicon/robot/R = src.loc + if(R && R.cell) + R.cell.use(50) + else + charges-- H.visible_message("[M] has been stunned with the [src] by [user]!") playsound(src.loc, "sparks", 75, 1, -1) if(charges < 1)