From 61124c86a8c8ae450cc10dfd79118a42ae6fc327 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 20 Jun 2012 09:34:17 -0700 Subject: [PATCH] Reduction of number of ul_Illuminate and ul_Extinguish calls. (@Miniature) Also fixed a bug with the SMES room lighting. --- code/WorkInProgress/SkyMarshal/Ultralight.dm | 9 ++++++--- code/game/area/areas.dm | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/WorkInProgress/SkyMarshal/Ultralight.dm b/code/WorkInProgress/SkyMarshal/Ultralight.dm index 84c690bb764..0c41b6d2b46 100644 --- a/code/WorkInProgress/SkyMarshal/Ultralight.dm +++ b/code/WorkInProgress/SkyMarshal/Ultralight.dm @@ -278,9 +278,12 @@ atom/Del() . = ..() atom/movable/Move() - ul_Extinguish() - . = ..() - ul_Illuminate() + if(LuminosityRed || LuminosityGreen || LuminosityBlue) + ul_Extinguish() + . = ..() + ul_Illuminate() + else + return ..() turf/var/list/MaxRed diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 4dcea1bf829..bc42481c643 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -37,8 +37,8 @@ power_light = 0//rastaf0 power_equip = 0//rastaf0 power_environ = 0//rastaf0 - luminosity = 1 - ul_Lighting = 0 + if(!ul_Lighting) + luminosity = 1 else luminosity = 0 area_lights_luminosity = rand(6,7)