Merge remote-tracking branch 'upstream/master' into diagonal-movement

code/modules/power/apc.dm

@@ -135,6 +135,9 @@
 	usesound = 'sound/items/deconstruct.ogg'
 	toolspeed = 1
 
+/obj/machinery/power/apc/get_cell()
+	return cell
+
 /obj/machinery/power/apc/connect_to_network()
 	//Override because the APC does not directly connect to the network; it goes through a terminal.
 	//The terminal is what the power computer looks for anyway.

code/modules/power/cell.dm

@@ -19,6 +19,9 @@
 	var/ratingdesc = TRUE
 	var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
 
+/obj/item/stock_parts/cell/get_cell()
+	return src
+
 /obj/item/stock_parts/cell/New()
 	..()
 	START_PROCESSING(SSobj, src)