From 2f0e4a172998648dc95162a8df241ce2186c5ac1 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 14 Jul 2014 13:13:23 -0400 Subject: [PATCH] update_use_power() now doesn't force updates... ...if it doesnt need to. --- code/game/machinery/machinery.dm | 3 +++ code/game/machinery/rechargestation.dm | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index accd117cd2..4e4c4f9024 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -159,6 +159,9 @@ Class Procs: //sets the use_power var and then forces an area power update /obj/machinery/proc/update_use_power(var/new_use_power) + if (new_use_power == use_power) + return //don't need to do anything + use_power = new_use_power use_power(0) //force area power update diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index cade7949c1..ddee1405a4 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -61,7 +61,10 @@ R.module.respawn_consumable(R) if(!R.cell) return - R.cell.give(active_power_usage*CELLRATE) + if(!R.cell.fully_charged()) + R.cell.give(active_power_usage*CELLRATE) + else + update_use_power(1) go_out() if(!( src.occupant )) return @@ -73,8 +76,7 @@ src.occupant.loc = src.loc src.occupant = null build_icon() - src.use_power = 1 - use_power(0) //update area power usage + update_use_power(1) return @@ -114,6 +116,5 @@ O.loc = src.loc*/ src.add_fingerprint(usr) build_icon() - src.use_power = 2 - use_power(0) //update area power usage + update_use_power(2) return \ No newline at end of file