From 509af0b2360182bbbe8341024a24bfe76c381d47 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Mon, 4 Aug 2014 01:54:27 -0400 Subject: [PATCH] Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun --- code/game/objects/items/weapons/storage/belt.dm | 3 ++- code/modules/projectiles/guns/energy/stun.dm | 1 - code/modules/projectiles/projectile/energy.dm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 86404cc54a4..46ef15a70a0 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -124,7 +124,8 @@ "/obj/item/device/radio/headset", "/obj/item/weapon/melee", "/obj/item/taperoll/police", - "/obj/item/weapon/gun/energy/taser" + "/obj/item/weapon/gun/energy/taser", + "/obj/item/weapon/gun/energy/stunrevolver" ) /obj/item/weapon/storage/belt/soulstone diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index a6aa3ac9c04..3703fa3d785 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -51,7 +51,6 @@ icon_state = "stunrevolver" fire_sound = 'sound/weapons/Taser.ogg' origin_tech = "combat=3;materials=3;powerstorage=2" - charge_cost = 1250 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 9f535b64385..b7b1245fe6f 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -25,10 +25,10 @@ name = "electrode" icon_state = "spark" nodamage = 1 - stun = 2 +/* stun = 2 weaken = 2 - stutter = 10 - agony = 35 + stutter = 10 */ + agony = 50 damage_type = HALLOSS hitsound = 'sound/weapons/tase.ogg' //Damage will be handled on the MOB side, to prevent window shattering.