revert power changes, moved them to a separate branch

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-07-27 02:22:03 +10:00
parent ca4979313a
commit be5820dd51
3 changed files with 5 additions and 7 deletions
+1 -1
View File
@@ -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)
+3 -5
View File
@@ -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)
+1 -1
View File
@@ -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