Merge pull request #1522 from caelaislinn/powerchanges

powerchanges
This commit is contained in:
Albert Iordache
2012-07-28 00:23:27 -07:00
3 changed files with 7 additions and 5 deletions

View File

@@ -85,7 +85,7 @@ Pod/Blast Doors computer
/obj/machinery/computer/process()
if(stat & (NOPOWER|BROKEN))
return
use_power(250)
use_power(750)
/obj/machinery/computer/proc/set_broken()
icon_state = initial(icon_state)

View File

@@ -114,7 +114,7 @@ Class Procs:
/obj/machinery/emp_act(severity)
if(use_power && stat == 0)
use_power(7500/severity)
use_power(15000/severity)
var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
pulse2.icon = 'effects.dmi'
@@ -147,13 +147,15 @@ 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_channel)
use_power(idle_power_usage * POWER_USE_MULTIPLIER,power_channel)
else if(src.use_power >= 2)
use_power(active_power_usage,power_channel)
use_power(active_power_usage * POWER_USE_MULTIPLIER,power_channel)
return 1
/obj/machinery/Topic(href, href_list)

View File

@@ -14,7 +14,7 @@
var/lastout = 0
var/loaddemand = 0
var/capacity = 10e6
var/charge = 3e6
var/charge = 5e6
var/charging = 0
var/chargemode = 0
var/chargecount = 0