Swaps non-mounted recharging guns to batteries

code/modules/projectiles/guns/energy.dm

@@ -34,12 +34,15 @@
 
 /obj/item/weapon/gun/energy/New()
 	..()
-	if(cell_type)
-		power_supply = new cell_type(src)
-	else
-		power_supply = new /obj/item/weapon/cell/device/weapon(src)
 	if(self_recharge)
+		power_supply = new /obj/item/weapon/cell/device/weapon(src)
 		processing_objects.Add(src)
+	else
+		if(cell_type)
+			power_supply = new cell_type(src)
+		else
+			power_supply = new /obj/item/weapon/cell/device/weapon(src)
+
 	update_icon()
 
 /obj/item/weapon/gun/energy/Destroy()

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

@@ -65,9 +65,8 @@
 	origin_tech = null
 	fire_delay = 10		//Old pistol
 	charge_cost = 480	//to compensate a bit for self-recharging
-	self_recharge = 1
-	recharge_time = 3	//Recharges a bit more quickly...
-	charge_delay = 100	//... but it takes a while to get started
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge/captain
+	battery_lock = 1
 
 /obj/item/weapon/gun/energy/lasercannon
 	name = "laser cannon"
@@ -87,7 +86,6 @@
 	accuracy = 3
 	charge_cost = 600
 
-
 /obj/item/weapon/gun/energy/lasercannon/mounted
 	name = "mounted laser cannon"
 	self_recharge = 1
@@ -145,10 +143,11 @@
 	item_state = "laser"
 	desc = "Standard issue weapon of the Imperial Guard"
 	origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2)
-	self_recharge = 1
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	fire_sound = 'sound/weapons/Laser.ogg'
 	projectile_type = /obj/item/projectile/beam/lastertag/blue
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	var/required_vest
 
 /obj/item/weapon/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M)

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

@@ -56,7 +56,8 @@
 	force = 8 //looks heavier than a pistol
 	w_class = ITEMSIZE_LARGE	//Looks bigger than a pistol, too.
 	fire_delay = 6	//This one's not a handgun, it should have the same fire delay as everything else
-	self_recharge = 1
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	modifystate = null
 
 //	requires_two_hands = 1

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

@@ -43,7 +43,8 @@
 	projectile_type = /obj/item/projectile/energy/floramut
 	origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
 	modifystate = "floramut"
-	self_recharge = 1
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	var/decl/plantgene/gene = null
 
 	firemodes = list(
@@ -137,7 +138,8 @@
 	charge_cost = 480
 	projectile_type = /obj/item/projectile/change
 	origin_tech = null
-	self_recharge = 1
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	charge_meter = 0
 
 /obj/item/weapon/gun/energy/staff/special_check(var/mob/user)
@@ -188,7 +190,8 @@ obj/item/weapon/gun/energy/staff/focus
 	w_class = ITEMSIZE_HUGE
 	charge_cost = 24 // 100 shots, it's a spray and pray (to RNGesus) weapon.
 	projectile_type = /obj/item/projectile/energy/blue_pellet
-	self_recharge = 1
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	accuracy = 5 // Suppressive weapons don't work too well if there's no risk of being hit.
 	burst_delay = 1 // Burst faster than average.
 	origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 6, TECH_ILLEGAL = 6)

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

@@ -41,7 +41,8 @@
 	fire_sound = 'sound/weapons/Genhit.ogg'
 	projectile_type = /obj/item/projectile/energy/bolt
 	charge_cost = 480
-	self_recharge = 1
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	charge_meter = 0
 
 /obj/item/weapon/gun/energy/crossbow/ninja

code/modules/projectiles/guns/vox.dm

@@ -60,7 +60,8 @@
 	w_class = ITEMSIZE_HUGE
 	charge_cost = 300
 	projectile_type = /obj/item/projectile/beam/stun/darkmatter
-	self_recharge = 1
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	accuracy = 2
 
 	firemodes = list(
@@ -118,7 +119,8 @@
 	item_state = "noise"
 	fire_sound = 'sound/effects/basscannon.ogg'
 	w_class = ITEMSIZE_HUGE
-	self_recharge = 1
+	cell_type = /obj/item/weapon/cell/device/weapon/recharge
+	battery_lock = 1
 	charge_cost = 600
 
 	projectile_type=/obj/item/projectile/sonic/weak