Merge pull request #6257 from VOREStation/upstream-merge-6554

[MIRROR] Protolathe Power Cells Tweak

code/modules/power/cells/power_cells.dm

@@ -18,6 +18,7 @@
 /obj/item/weapon/cell/secborg/empty/New()
 	..()
 	charge = 0
+	update_icon()
 
 /obj/item/weapon/cell/apc
 	name = "heavy-duty power cell"
@@ -35,6 +36,7 @@
 /obj/item/weapon/cell/high/empty/New()
 	..()
 	charge = 0
+	update_icon()
 
 /obj/item/weapon/cell/super
 	name = "super-capacity power cell"
@@ -46,6 +48,7 @@
 /obj/item/weapon/cell/super/empty/New()
 	..()
 	charge = 0
+	update_icon()
 
 /obj/item/weapon/cell/hyper
 	name = "hyper-capacity power cell"
@@ -57,6 +60,7 @@
 /obj/item/weapon/cell/hyper/empty/New()
 	..()
 	charge = 0
+	update_icon()
 
 /obj/item/weapon/cell/infinite
 	name = "infinite-capacity power cell!"

code/modules/research/designs.dm

@@ -61,4 +61,13 @@ other types of metals and chemistry for reagents).
 	return new build_path(newloc)
 
 /datum/design/item
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE
+
+//Make sure items don't get free power
+/datum/design/item/Fabricate()
+	var/obj/item/I = ..()
+	var/obj/item/weapon/cell/C = I.get_cell()
+	if(C)
+		C.charge = 0
+		I.update_icon()
+	return I

code/modules/research/designs/power_cells.dm

@@ -12,6 +12,7 @@
 /datum/design/item/powercell/Fabricate()
 	var/obj/item/weapon/cell/C = ..()
 	C.charge = 0 //shouldn't produce power out of thin air.
+	C.update_icon()
 	return C
 
 /datum/design/item/powercell/basic