fix up 2.0

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -144,7 +144,7 @@
 /obj/item/ammo_casing/energy/kinetic
 	projectile_type = /obj/item/projectile/kinetic
 	select_name = "kinetic"
-	e_cost = 5000
+	e_cost = 500
 	fire_sound = 'sound/weapons/Kenetic_accel.ogg' // fine spelling there chap
 
 /obj/item/ammo_casing/energy/kinetic/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")

code/modules/projectiles/guns/energy/nuclear.dm

@@ -39,8 +39,8 @@
 /obj/item/weapon/gun/energy/gun/mini/New()
 	gun_light = new /obj/item/device/flashlight/seclite(src)
 	..()
-	power_supply.maxcharge = 6000
-	power_supply.charge = 6000
+	power_supply.maxcharge = 600
+	power_supply.charge = 600
 
 /obj/item/weapon/gun/energy/gun/mini/update_icon()
 	..()

code/modules/projectiles/guns/energy/special.dm

@@ -308,12 +308,10 @@
 	desc = "A gun that changes the body temperature of its targets."
 	var/temperature = 300
 	var/target_temperature = 300
-	var/e_cost = 1000
 	origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
 
 	ammo_type = list(/obj/item/ammo_casing/energy/temp)
 	selfcharge = 1
-	cell_type = /obj/item/weapon/stock_parts/cell
 
 	var/powercost = ""
 	var/powercostcolor = ""
@@ -369,19 +367,19 @@
 	T.temp = temperature
 	switch(temperature)
 		if(0 to 100)
-			T.e_cost = 3000
+			T.e_cost = 300
 			powercost = "High"
 		if(100 to 250)
-			T.e_cost = 2000
+			T.e_cost = 200
 			powercost = "Medium"
 		if(251 to 300)
-			T.e_cost = 1000
+			T.e_cost = 100
 			powercost = "Low"
 		if(301 to 400)
-			T.e_cost = 2000
+			T.e_cost = 200
 			powercost = "Medium"
 		if(401 to 1000)
-			T.e_cost = 3000
+			T.e_cost = 300
 			powercost = "High"
 	switch(powercost)
 		if("High")
@@ -471,16 +469,16 @@
 /obj/item/weapon/gun/energy/temperature/proc/update_charge()
 	var/charge = power_supply.charge
 	switch(charge)
-		if(9000 to INFINITY)		overlays += "900"
-		if(8000 to 9000)			overlays += "800"
-		if(7000 to 8000)			overlays += "700"
-		if(6000 to 7000)			overlays += "600"
-		if(5000 to 6000)			overlays += "500"
-		if(4000 to 5000)			overlays += "400"
-		if(3000 to 4000)			overlays += "300"
-		if(2000 to 3000)			overlays += "200"
-		if(1000 to 2002)			overlays += "100"
-		if(-INFINITY to 1000)	overlays += "0"
+		if(900 to INFINITY)		overlays += "900"
+		if(800 to 900)			overlays += "800"
+		if(700 to 800)			overlays += "700"
+		if(600 to 700)			overlays += "600"
+		if(500 to 600)			overlays += "500"
+		if(400 to 500)			overlays += "400"
+		if(300 to 400)			overlays += "300"
+		if(200 to 300)			overlays += "200"
+		if(100 to 202)			overlays += "100"
+		if(-INFINITY to 100)	overlays += "0"
 
 /obj/item/weapon/gun/energy/mimicgun
 	name = "mimic gun"

code/modules/projectiles/guns/energy/stun.dm

@@ -5,23 +5,12 @@
 	item_state = null	//so the human update icon uses the icon_state instead.
 	ammo_type = list(/obj/item/ammo_casing/energy/electrode)
 	ammo_x_offset = 3
-	cell_type = /obj/item/weapon/stock_parts/cell/crap
 
 /obj/item/weapon/gun/energy/taser/mounted
 	name = "mounted taser gun"
 	selfcharge = 1
 	use_external_power = 1
 
-/obj/item/weapon/gun/energy/taser/cyborg
-	name = "taser gun"
-	desc = "A small, low capacity gun used for non-lethal takedowns."
-	icon_state = "taser"
-	cell_type = /obj/item/weapon/stock_parts/cell/secborg
-
-/obj/item/weapon/gun/energy/disabler/cyborg/newshot()
-	..()
-	robocharge()
-
 /obj/item/weapon/gun/energy/shock_revolver
 	name = "tesla revolver"
 	desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."

code/modules/projectiles/guns/energy/telegun.dm

@@ -6,7 +6,6 @@
 	icon_state = "telegun"
 	item_state = "ionrifle"
 	origin_tech = "combat=6;materials=7;powerstorage=5;bluespace=5;syndicate=4"
-	cell_type = /obj/item/weapon/stock_parts/cell/crap
 	ammo_type = list(/obj/item/ammo_casing/energy/teleport)
 	shaded_charge = 1
 	var/teleport_target = null