From 8d5e6264f1a20141b89688f867f1f4030ab334e4 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Tue, 25 Mar 2025 06:12:56 -0400 Subject: [PATCH] refactor: speed up emergency light change (#28749) --- code/modules/power/lights.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm index a270e3c421e..b2d9ecc0684 100644 --- a/code/modules/power/lights.dm +++ b/code/modules/power/lights.dm @@ -766,13 +766,12 @@ // attempts to set emergency lights /obj/machinery/light/proc/set_emergency_lights() - var/area/current_area = get_area(src) - var/obj/machinery/power/apc/current_apc = current_area.get_apc() + var/obj/machinery/power/apc/current_apc = machine_powernet?.powernet_apc if(status != LIGHT_OK || !current_apc || flickering || no_emergency) - emergency_lights_off(current_area, current_apc) + emergency_lights_off(current_apc) return if(current_apc.emergency_lights || !current_apc.emergency_power) - emergency_lights_off(current_area, current_apc) + emergency_lights_off(current_apc) return if(fire_mode) set_light(nightshift_light_range, nightshift_light_power, bulb_emergency_colour) @@ -783,7 +782,7 @@ update_icon() RegisterSignal(machine_powernet, COMSIG_POWERNET_POWER_CHANGE, PROC_REF(update), override = TRUE) -/obj/machinery/light/proc/emergency_lights_off(area/current_area, obj/machinery/power/apc/current_apc) +/obj/machinery/light/proc/emergency_lights_off(obj/machinery/power/apc/current_apc) set_light(0, 0, 0) //you, sir, are off! if(current_apc) RegisterSignal(machine_powernet, COMSIG_POWERNET_POWER_CHANGE, PROC_REF(update), override = TRUE)