From 1c44f7da157622bfa927fbe76a61d1fbe0162036 Mon Sep 17 00:00:00 2001
From: "Superxpdude@gmail.com"
 <Superxpdude@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 15 Jul 2011 17:46:31 +0000
Subject: [PATCH] Some balancing tweaks with the new guns firecage added.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1857 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/items/weapons/guns_new.dm |  9 +++++----
 code/game/research/designs.dm               | 12 +++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm
index a2a6bb52b0b..a199e2ba1a8 100644
--- a/code/game/objects/items/weapons/guns_new.dm
+++ b/code/game/objects/items/weapons/guns_new.dm
@@ -751,6 +751,7 @@ var/const/PROJECTILE_SHOCK = 9
 
 		taser
 			name = "taser gun"
+			desc = "A small, low capacity gun used for non-lethal takedowns."
 			icon_state = "taser"
 			fire_sound = 'Taser.ogg'
 			charge_cost = 100
@@ -786,7 +787,7 @@ var/const/PROJECTILE_SHOCK = 9
 			name = "shock gun"
 			icon_state = "shockgun"
 			fire_sound = 'Laser.ogg'
-			charge_cost = 50
+			charge_cost = 250
 
 			load_into_chamber()
 				if(in_chamber)
@@ -801,14 +802,14 @@ var/const/PROJECTILE_SHOCK = 9
 				return
 
 			New()
-				power_supply = new /obj/item/weapon/cell/super(src)
+				power_supply = new /obj/item/weapon/cell(src)
 				power_supply.give(power_supply.maxcharge)
 
 		stunrevolver
 			name = "stun revolver"
 			icon_state = "stunrevolver"
 			fire_sound = 'Gunshot.ogg'
-			charge_cost = 25
+			charge_cost = 125
 
 			load_into_chamber()
 				if(in_chamber)
@@ -823,7 +824,7 @@ var/const/PROJECTILE_SHOCK = 9
 				return
 
 			New()
-				power_supply = new /obj/item/weapon/cell/crap(src)
+				power_supply = new /obj/item/weapon/cell(src)
 				power_supply.give(power_supply.maxcharge)
 
 		freeze
diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm
index 2e376aa704d..3f2609018c6 100644
--- a/code/game/research/designs.dm
+++ b/code/game/research/designs.dm
@@ -933,21 +933,19 @@ datum
 		stunrevolver
 			name = "Stun Revolver"
 			desc = "The prize of the Head of Security."
-			id = "nuclear_gun"
-			req_tech = list("combat" = 2, "materials" = 2)
+			id = "stunrevolver"
+			req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2)
 			build_type = PROTOLATHE
-			materials = list("$metal" = 4000)
-			reliability_base = 76
+			materials = list("$metal" = 4000, "$gold" = 500)
 			build_path = "/obj/item/weapon/gun/energy/stunrevolver"
 
 		shockgun
 			name = "Shock Gun"
 			desc = "Your opponent has just lost THE GAME."
 			id = "shockgun"
-			req_tech = list("combat" = 4, "materials" = 4, "powerstorage" = 3)
+			req_tech = list("combat" = 6, "materials" = 4, "powerstorage" = 3)
 			build_type = PROTOLATHE
-			materials = list("$metal" = 8000, "$silver" = 3000)
-			reliability_base = 76
+			materials = list("$metal" = 8000, "$silver" = 3000, "$gold" = 500)
 			build_path = "/obj/item/weapon/gun/energy/shockgun"
 
 		chemsprayer