mining drill and recharger find their shiny new cells

code/game/machinery/machinery.dm

@@ -312,7 +312,11 @@ Class Procs:
 		qdel(C)
 		C = new /obj/item/weapon/cell/high(src)
 		component_parts += C
+<<<<<<< HEAD
 		RefreshParts()
+=======
+		return C
+>>>>>>> edd7803... mining drill and recharger find their shiny new cells (#7290)
 
 /obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/weapon/storage/part_replacer/R)
 	if(!istype(R))

code/game/machinery/rechargestation.dm

@@ -25,7 +25,7 @@
 /obj/machinery/recharge_station/Initialize()
 	. = ..()
 	default_apply_parts()
-	default_use_hicell()
+	cell = default_use_hicell()
 	update_icon()
 
 /obj/machinery/recharge_station/proc/has_cell_power()

code/modules/mining/drilling/drill.dm

@@ -57,7 +57,7 @@
 	if(ispath(cell))
 		cell = new cell(src)
 	default_apply_parts()
-	default_use_hicell()
+	cell = default_use_hicell()
 
 /obj/machinery/mining/drill/loaded
 	cell = /obj/item/weapon/cell/high