From dc417a522deb21bb1cf538f7bc6c171005b74b46 Mon Sep 17 00:00:00 2001 From: Necaladun Date: Tue, 15 Apr 2014 00:28:38 +0930 Subject: [PATCH] Stun Revolver Upgrade Stun Revolver update - makes it do slightly less pain, but a little bit of stun and weaken to give it some actual purpose --- code/modules/projectiles/guns/energy/stun.dm | 2 +- code/modules/projectiles/projectile/energy.dm | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 1daabe7eb08..f241c8b81fd 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -53,7 +53,7 @@ fire_sound = 'sound/weapons/Gunshot.ogg' origin_tech = "combat=3;materials=3;powerstorage=2" charge_cost = 125 - projectile_type = "/obj/item/projectile/energy/electrode" + projectile_type = "/obj/item/projectile/energy/electroderevolver" cell_type = "/obj/item/weapon/cell" diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 50e9a1d97d6..9f535b64385 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -20,6 +20,19 @@ hitsound = 'sound/weapons/tase.ogg' //Damage will be handled on the MOB side, to prevent window shattering. + +/obj/item/projectile/energy/electroderevolver + name = "electrode" + icon_state = "spark" + nodamage = 1 + stun = 2 + weaken = 2 + stutter = 10 + agony = 35 + damage_type = HALLOSS + hitsound = 'sound/weapons/tase.ogg' + //Damage will be handled on the MOB side, to prevent window shattering. + /obj/item/projectile/energy/declone name = "declone" icon_state = "declone"