From be5820dd514ef8cc09e4bae245edef7c4de03b69 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Fri, 27 Jul 2012 02:22:03 +1000
Subject: [PATCH] revert power changes, moved them to a separate branch

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 code/game/machinery/computer/computer.dm | 2 +-
 code/game/machinery/machinery.dm         | 8 +++-----
 code/modules/power/smes.dm               | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index f7bef1b2d53..427fa9015cf 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -85,7 +85,7 @@ Pod/Blast Doors computer
 /obj/machinery/computer/process()
 	if(stat & (NOPOWER|BROKEN))
 		return
-	use_power(750)
+	use_power(250)
 
 /obj/machinery/computer/proc/set_broken()
 	icon_state = initial(icon_state)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index eb949b646ed..d45b913bc35 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -114,7 +114,7 @@ Class Procs:
 
 /obj/machinery/emp_act(severity)
 	if(use_power && stat == 0)
-		use_power(15000/severity)
+		use_power(7500/severity)
 
 		var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
 		pulse2.icon = 'effects.dmi'
@@ -147,15 +147,13 @@ Class Procs:
 	if(prob(50))
 		del(src)
 
-#define POWER_USE_MULTIPLIER 3
-
 /obj/machinery/proc/auto_use_power()
 	if(!powered(power_channel))
 		return 0
 	if(src.use_power == 1)
-		use_power(idle_power_usage * POWER_USE_MULTIPLIER,power_channel)
+		use_power(idle_power_usage,power_channel)
 	else if(src.use_power >= 2)
-		use_power(active_power_usage * POWER_USE_MULTIPLIER,power_channel)
+		use_power(active_power_usage,power_channel)
 	return 1
 
 /obj/machinery/Topic(href, href_list)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 7ce415b01da..3b25a10d9e3 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -14,7 +14,7 @@
 	var/lastout = 0
 	var/loaddemand = 0
 	var/capacity = 10e6
-	var/charge = 5e6
+	var/charge = 3e6
 	var/charging = 0
 	var/chargemode = 0
 	var/chargecount = 0