From 84f02ae47c1ea01d49b872e446ca78bc87bcacfd Mon Sep 17 00:00:00 2001 From: Aryn Date: Mon, 24 Feb 2014 07:55:36 -0700 Subject: [PATCH] Reverted unrelated ZAS modification and unnecessary check. --- code/ZAS/Zone.dm | 1 - code/modules/power/lighting.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/ZAS/Zone.dm b/code/ZAS/Zone.dm index 2d3346ab05..17d6097cda 100644 --- a/code/ZAS/Zone.dm +++ b/code/ZAS/Zone.dm @@ -108,7 +108,6 @@ Class Procs: /zone/proc/rebuild() if(invalid) return //Short circuit for explosions where rebuild is called many times over. - if(air_master.current_cycle == 0) return //Why would you rebuild when you're building? c_invalidate() for(var/turf/simulated/T in contents) //T.dbg(invalid_zone) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 076a1b28e8..0a3a4d3794 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -604,7 +604,7 @@ #define LIGHTING_POWER_FACTOR 20 //20W per unit luminosity /obj/machinery/light/process()//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY - if(on && light) + if(on) use_power(luminosity * LIGHTING_POWER_FACTOR, LIGHT) // called when area power state changes