diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 4b627210205..27812f53dba 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -130,18 +130,16 @@
 		charge_rate *= capacitor.tier
 
 /obj/machinery/cell_charger/process(seconds_per_tick)
-	if(!charging || !anchored || (machine_stat & (BROKEN|NOPOWER)))
-		return
-
-	if(charging.percent() >= 100)
+	if(!charging || charging.percent() >= 100 || !anchored || !is_operational)
 		return
 
 	var/main_draw = charge_rate * seconds_per_tick
 	if(!main_draw)
 		return
 
-	//use a small bit for the charger itself, but power usage scales up with the part tier
-	use_energy(main_draw * 0.01)
-	charge_cell(main_draw, charging, grid_only = TRUE)
+	//charge cell, account for heat loss from work done
+	var/charge_given = charge_cell(main_draw, charging, grid_only = TRUE)
+	if(charge_given)
+		use_energy((charge_given + active_power_usage) * 0.01)
 
 	update_appearance()
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index b328d99284d..2a2f219e618 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -60,7 +60,12 @@
 /obj/machinery/recharge_station/proc/charge_target_cell(obj/item/stock_parts/cell/target, seconds_per_tick)
 	PRIVATE_PROC(TRUE)
 
-	return charge_cell(recharge_speed * seconds_per_tick, target, grid_only = TRUE)
+	//charge the cell, account for heat loss from work done
+	var/charge_given = charge_cell(recharge_speed * seconds_per_tick, target, grid_only = TRUE)
+	if(charge_given)
+		use_energy((charge_given + active_power_usage) * 0.01)
+
+	return charge_given
 
 /obj/machinery/recharge_station/RefreshParts()
 	. = ..()
@@ -88,12 +93,6 @@
 	else //Turned on
 		begin_processing()
 
-
-/obj/machinery/recharge_station/process(seconds_per_tick)
-	if(occupant)
-		process_occupant(seconds_per_tick)
-	return 1
-
 /obj/machinery/recharge_station/relaymove(mob/living/user, direction)
 	if(user.stat)
 		return
@@ -174,11 +173,8 @@
 	icon_state = "borgcharger[state_open ? 0 : (occupant ? 1 : 2)]"
 	return ..()
 
-/obj/machinery/recharge_station/proc/process_occupant(seconds_per_tick)
-	if(!occupant)
-		return
-
-	if(!use_energy(active_power_usage * seconds_per_tick, force = FALSE))
+/obj/machinery/recharge_station/process(seconds_per_tick)
+	if(QDELETED(occupant) || !is_operational)
 		return
 
 	SEND_SIGNAL(occupant, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, charge_cell, seconds_per_tick, repairs, sendmats)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4be370db44b..b5c80a6a739 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -950,13 +950,14 @@
 
 /mob/living/silicon/robot/proc/charge(datum/source, datum/callback/charge_cell, seconds_per_tick, repairs, sendmats)
 	SIGNAL_HANDLER
-	charge_cell.Invoke(cell, seconds_per_tick)
+
 	if(model)
-		model.respawn_consumable(src, cell.use(cell.chargerate * 0.005))
+		model.respawn_consumable(src, cell.use(cell.charge * 0.005))
 		if(sendmats)
 			model.restock_consumable()
 	if(repairs)
 		heal_bodypart_damage(repairs, repairs)
+	charge_cell.Invoke(cell, seconds_per_tick)
 
 /mob/living/silicon/robot/proc/set_connected_ai(new_ai)
 	if(connected_ai == new_ai)
diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm
index 1a6ce31e284..5166b9c5fdf 100644
--- a/code/modules/vehicles/mecha/mech_bay.dm
+++ b/code/modules/vehicles/mecha/mech_bay.dm
@@ -64,10 +64,11 @@
 			recharge_console.update_appearance()
 	if(!recharging_mech?.cell)
 		return
-	if(recharging_mech.cell.charge < recharging_mech.cell.maxcharge)
-		if(!use_energy(active_power_usage * seconds_per_tick, force = FALSE))
-			return
-		charge_cell(recharge_power * seconds_per_tick, recharging_mech.cell, grid_only = TRUE)
+	if(recharging_mech.cell.used_charge())
+		//charge cell, account for heat loss given from work done
+		var/charge_given = charge_cell(recharge_power * seconds_per_tick, recharging_mech.cell, grid_only = TRUE)
+		if(charge_given)
+			use_energy((charge_given + active_power_usage) * 0.01)
 	else
 		recharge_console.update_appearance()
 	if(recharging_mech.loc != recharging_turf)