Merge pull request #11119 from Ghommie/Ghommie-cit584

Something about consistency and magnetic rifles.

code/modules/power/cell.dm

@@ -357,16 +357,10 @@
 	maxcharge = 12000
 	chargerate = 600
 
-/obj/item/stock_parts/cell/magnetic/empty
-	start_charged = FALSE
-
 /obj/item/stock_parts/cell/magnetic/pistol
 	name = "magpistol power supply"
 	maxcharge = 6000
 
-/obj/item/stock_parts/cell/magnetic/pistol/empty
-	start_charged = FALSE
-
 /obj/item/stock_parts/cell/toymagburst
 	name = "toy mag burst rifle power supply"
 	maxcharge = 4000

code/modules/projectiles/guns/ballistic/magweapon.dm

@@ -61,7 +61,6 @@
 /obj/item/gun/ballistic/automatic/magrifle/nopin
 	pin = null
 	spawnwithmagazine = FALSE
-	cell_type = /obj/item/stock_parts/cell/magnetic/empty
 
 /obj/item/gun/ballistic/automatic/magrifle/hyperburst
 	name = "\improper Hyper-Burst Rifle"
@@ -100,4 +99,3 @@
 /obj/item/gun/ballistic/automatic/magrifle/pistol/nopin
 	pin = null
 	spawnwithmagazine = FALSE
-	cell_type = /obj/item/stock_parts/cell/magnetic/pistol/empty

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

@@ -11,6 +11,7 @@
 
 /obj/item/gun/energy/laser/practice
 	name = "practice laser gun"
+	icon_state = "laser-p"
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
 	clumsy_check = 0

modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm

@@ -1,7 +1,3 @@
-/obj/item/gun/energy/e_gun
-	name = "blaster carbine"
-	desc = "A high powered particle blaster carbine with varitable setting for stunning or lethal applications."
-
 /*/////////////////////////////////////////////////////////////////////////////////////////////
 							The Recolourable Energy Gun
 *//////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -1,11 +0,0 @@
-/obj/item/gun/energy/laser
-	name = "blaster rifle"
-	desc = "a high energy particle blaster, efficient and deadly."
-
-/obj/item/gun/energy/laser/practice
-	icon = 'modular_citadel/icons/obj/guns/energy.dmi'
-	icon_state = "laser-p"
-	lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
-	righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
-	ammo_x_offset = 1
-	shaded_charge = 1

tgstation.dme

@@ -3201,7 +3201,6 @@
 #include "modular_citadel\code\modules\projectiles\guns\ballistic\rifles.dm"
 #include "modular_citadel\code\modules\projectiles\guns\ballistic\spinfusor.dm"
 #include "modular_citadel\code\modules\projectiles\guns\energy\energy_gun.dm"
-#include "modular_citadel\code\modules\projectiles\guns\energy\laser.dm"
 #include "modular_citadel\code\modules\projectiles\projectiles\reusable.dm"
 #include "modular_citadel\code\modules\reagents\chemistry\reagents\astrogen.dm"
 #include "modular_citadel\code\modules\reagents\chemistry\reagents\eigentstasium.dm"