From 982b83854b11e5e3971475ba7750c2b2b63c8a88 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Tue, 8 Feb 2011 01:42:03 +0000 Subject: [PATCH] Secborg meleetaser now drains cell charge instead of gun charge. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@990 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/guns_ammo.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm index 575e30a7847..fe1e9fff41a 100644 --- a/code/game/objects/items/weapons/guns_ammo.dm +++ b/code/game/objects/items/weapons/guns_ammo.dm @@ -751,7 +751,11 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) if (O.client) O.show_message("\red [M] has been stunned with the taser gun by [user]!", 1, "\red You hear someone fall", 2) - src.charges-- + if(isrobot(user)) + var/mob/living/silicon/robot/R = user + R.cell.charge -= 20 + else + src.charges-- update_icon() else // no charges in the gun, so they just wallop the target with it ..()