From 69c3c8c98f1c36190fc871e1a45b2d1008e26559 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sat, 13 Jun 2020 03:56:13 -0700
Subject: [PATCH] mining drill and recharger find their shiny new cells

---
 code/game/machinery/machinery.dm       | 4 ++++
 code/game/machinery/rechargestation.dm | 2 +-
 code/modules/mining/drilling/drill.dm  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index d0686d0d99..9484ca259a 100644
--- a/code/game/machinery/machinery.dm
+++ b/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))
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 59d788b524..af7cdd5dfb 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/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()
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index ca04d74650..c9423aa3aa 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/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