Merge pull request #2260 from Markolie/fixesfixesfixesfixesfixesfixes

Fixes

code/modules/projectiles/guns/energy.dm

@@ -11,72 +11,42 @@
 	var/modifystate
 	var/can_charge = 1
 
-	emp_act(severity)
+/obj/item/weapon/gun/energy/emp_act(severity)
+	if(power_supply)
 		power_supply.use(round(power_supply.charge / severity))
 		update_icon()
 
+/obj/item/weapon/gun/energy/New()
+	..()
+	if(cell_type)
+		power_supply = new cell_type(src)
+	else
+		power_supply = new(src)
+	power_supply.give(power_supply.maxcharge)
+	return
 
-	New()
-		..()
-		if(cell_type)
-			power_supply = new cell_type(src)
+/obj/item/weapon/gun/energy/process_chambered()
+	if(in_chamber)	return 1
+	if(!power_supply)	return 0
+	if(!power_supply.use(charge_cost))	return 0
+	if(!projectile_type)	return 0
+	in_chamber = new projectile_type(src)
+	return 1
+
+/obj/item/weapon/gun/energy/update_icon()
+	if(cell_type)
+		var/ratio = power_supply.charge / power_supply.maxcharge
+		ratio = round(ratio, 0.25) * 100
+		if(modifystate)
+			icon_state = "[modifystate][ratio]"
 		else
-			power_supply = new(src)
-		power_supply.give(power_supply.maxcharge)
-		return
-
-
-	process_chambered()
-		if(in_chamber)	return 1
-		if(!power_supply)	return 0
-		if(!power_supply.use(charge_cost))	return 0
-		if(!projectile_type)	return 0
-		in_chamber = new projectile_type(src)
-		return 1
-
-
-	update_icon()
-		if(cell_type)
-			var/ratio = power_supply.charge / power_supply.maxcharge
-			ratio = round(ratio, 0.25) * 100
-			if(modifystate)
-				icon_state = "[modifystate][ratio]"
-			else
-				icon_state = "[initial(icon_state)][ratio]"
+			icon_state = "[initial(icon_state)][ratio]"
+	else
+		icon_state = "energy0"
+	overlays.Cut()
+	if(F)
+		if(F.on)
+			overlays += "flight-on"
 		else
-			icon_state = "energy0"
-		overlays.Cut()
-		if(F)
-			if(F.on)
-				overlays += "flight-on"
-			else
-				overlays += "flight"
-		return
-
-/*
-	attackby(obj/item/weapon/W, mob/user, params)
-		if(istype(W, /obj/item/weapon/stock_parts/cell))
-			if(!power_supply)
-				user.drop_item()
-				W.loc = src
-				power_supply = W
-				user << "<span class='notice'>You install a cell in [src].</span>"
-				update_icon()
-			else
-				user << "<span class='notice'>[src] already has a cell.</span>"
-
-		else if(istype(W, /obj/item/weapon/screwdriver))
-			if(power_supply)
-				power_supply.updateicon()
-				power_supply.loc = get_turf(src.loc)
-				power_supply = null
-				user << "<span class='notice'>You remove the cell from the [src].</span>"
-				update_icon()
-				return
-			..()
-		return
-
-	examine(mob/user)
-		if(..(user, 1))
-			if(!power_supply)
-				usr <<"<span class='warning'>The weapon does not have a power source installed.</span>" */
+			overlays += "flight"
+	return