diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 21e1a34d33..bde060a11a 100755
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -185,7 +185,7 @@
var/new_flow_rate = input(usr,"Enter new flow rate (0-[air1.volume]L/s)","Flow Rate Control",src.set_flow_rate) as num
src.set_flow_rate = max(0, min(air1.volume, new_flow_rate))
if(href_list["power"])
- use_power=!use_power
+ update_use_power(!use_power)
src.update_icon()
src.updateUsrDialog()
/*
diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm
index f7e4749fe3..ec0366547f 100644
--- a/code/game/machinery/bioprinter.dm
+++ b/code/game/machinery/bioprinter.dm
@@ -161,7 +161,7 @@
container.reagents.remove_reagent("biomass", possible_list[choice][2])
- use_power = USE_POWER_ACTIVE
+ update_use_power(USE_POWER_ACTIVE)
printing = 1
update_icon()
@@ -169,7 +169,7 @@
sleep(print_delay)
- use_power = USE_POWER_IDLE
+ update_use_power(USE_POWER_IDLE)
printing = 0
update_icon()
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 9adf2a0a43..10eb6bda85 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -182,7 +182,7 @@
if(istype(L))
L.tracking_cancelled()
current_camera = null
- use_power = USE_POWER_IDLE
+ update_use_power(USE_POWER_IDLE)
//Camera control: mouse.
/atom/DblClick()
diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm
index df40ba1a7d..20be7d52ca 100644
--- a/code/game/machinery/supplybeacon.dm
+++ b/code/game/machinery/supplybeacon.dm
@@ -80,7 +80,7 @@
return
set_light(3, 3, "#00CCAA")
icon_state = "beacon_active"
- use_power = USE_POWER_IDLE
+ update_use_power(USE_POWER_IDLE)
if(user) to_chat(user, "You activate the beacon. The supply drop will be dispatched soon.")
/obj/machinery/power/supply_beacon/proc/deactivate(var/mob/user, var/permanent)
@@ -90,7 +90,7 @@
else
icon_state = "beacon"
set_light(0)
- use_power = USE_POWER_OFF
+ update_use_power(USE_POWER_OFF)
target_drop_time = null
if(user) to_chat(user, "You deactivate the beacon.")
diff --git a/code/game/objects/structures/holoplant.dm b/code/game/objects/structures/holoplant.dm
index 9a46b8ca15..bf2365a7b1 100644
--- a/code/game/objects/structures/holoplant.dm
+++ b/code/game/objects/structures/holoplant.dm
@@ -48,13 +48,13 @@
plant = prepare_icon(emagged ? "emagged" : null)
overlays += plant
set_light(2)
- use_power = USE_POWER_ACTIVE
+ update_use_power(USE_POWER_ACTIVE)
/obj/machinery/holoplant/proc/deactivate()
overlays -= plant
QDEL_NULL(plant)
set_light(0)
- use_power = USE_POWER_OFF
+ update_use_power(USE_POWER_OFF)
/obj/machinery/holoplant/power_change()
..()
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index 5783bfc398..2d02146315 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -301,7 +301,7 @@
last_change = world.time
active = 1
- use_power = USE_POWER_ACTIVE
+ update_use_power(USE_POWER_ACTIVE)
for(var/item in holographic_objs)
derez(item)
@@ -362,7 +362,7 @@
last_gravity_change = world.time
active = 1
- use_power = USE_POWER_IDLE
+ update_use_power(USE_POWER_IDLE)
if(A.has_gravity)
A.gravitychange(0)
@@ -377,4 +377,4 @@
linkedholodeck.gravitychange(1)
active = 0
- use_power = USE_POWER_IDLE
+ update_use_power(USE_POWER_IDLE)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 92ea946db4..7e9edb67da 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -438,7 +438,7 @@ var/global/list/light_type_cache = list()
update_use_power(USE_POWER_ACTIVE)
set_light(brightness_range, brightness_power, brightness_color)
else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE) && !turned_off())
- use_power = 1
+ update_use_power(USE_POWER_IDLE)
emergency_mode = TRUE
START_PROCESSING(SSobj, src)
else