Merge pull request #7026 from VOREStation/vplk-update-power-usage

More machinery power update_var() proc usage

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()
 /*

code/game/gamemodes/malfunction/malf_hardware.dm

@@ -64,4 +64,4 @@
 		T.maxhealth = round(initial(T.maxhealth) * 1.4)
 		T.shot_delay = round(initial(T.shot_delay) / 2)
 		T.auto_repair = 1
-		T.active_power_usage = round(initial(T.active_power_usage) * 5)
+		T.update_active_power_usage(round(initial(T.active_power_usage) * 5))

code/game/machinery/Sleeper.dm

@@ -207,8 +207,6 @@
 
 	available_chemicals.Cut()
 	available_chemicals = base_chemicals.Copy()
-	idle_power_usage = initial(idle_power_usage)
-	active_power_usage = initial(active_power_usage)
 
 	for(var/obj/item/weapon/stock_parts/P in component_parts)
 		if(istype(P, /obj/item/weapon/stock_parts/capacitor))
@@ -216,8 +214,8 @@
 
 	cap_rating = max(1, round(cap_rating / 2))
 
-	idle_power_usage /= cap_rating
-	active_power_usage /= cap_rating
+	update_idle_power_usage(initial(idle_power_usage) / cap_rating)
+	update_active_power_usage(initial(active_power_usage) / cap_rating)
 
 	if(!limited)
 		for(var/obj/item/weapon/stock_parts/P in component_parts)

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()
 

code/game/machinery/camera/presets.dm

@@ -222,4 +222,4 @@ var/global/list/engineering_networks = list(
 		mult++
 	if (isMotion())
 		mult++
-	active_power_usage = mult*initial(active_power_usage)
+	update_active_power_usage(mult * initial(active_power_usage))

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()

code/game/machinery/exonet_node.dm

@@ -58,13 +58,13 @@
 	if(toggle)
 		if(stat & (BROKEN|NOPOWER|EMPED))
 			on = 0
-			idle_power_usage = 0
+			update_idle_power_usage(0)
 		else
 			on = 1
-			idle_power_usage = 2500
+			update_idle_power_usage(2500)
 	else
 		on = 0
-		idle_power_usage = 0
+		update_idle_power_usage(0)
 	update_icon()
 
 // Proc: emp_act()

code/game/machinery/floor_light.dm

@@ -99,7 +99,7 @@ var/list/floor_light_cache = list()
 		if(light_range || light_power)
 			set_light(0)
 
-	active_power_usage = ((light_range + light_power) * 10)
+	update_active_power_usage((light_range + light_power) * 10)
 	update_icon()
 
 /obj/machinery/floor_light/update_icon()

code/game/machinery/machinery.dm

@@ -196,6 +196,18 @@ Class Procs:
 /obj/machinery/proc/update_use_power(var/new_use_power)
 	use_power = new_use_power
 
+// Sets the power_channel var
+/obj/machinery/proc/update_power_channel(var/new_channel)
+	power_channel = new_channel
+
+// Sets the idle_power_usage var
+/obj/machinery/proc/update_idle_power_usage(var/new_power_usage)
+	idle_power_usage = new_power_usage
+
+// Sets the active_power_usage var
+/obj/machinery/proc/update_active_power_usage(var/new_power_usage)
+	active_power_usage = new_power_usage
+
 /obj/machinery/proc/auto_use_power()
 	if(!powered(power_channel))
 		return 0
@@ -205,6 +217,21 @@ Class Procs:
 		use_power(active_power_usage, power_channel, 1)
 	return 1
 
+/obj/machinery/vv_edit_var(var/var_name, var/new_value)
+	if(var_name == NAMEOF(src, use_power))
+		update_use_power(new_value)
+		return TRUE
+	else if(var_name == NAMEOF(src, power_channel))
+		update_power_channel(new_value)
+		return TRUE
+	else if(var_name == NAMEOF(src, idle_power_usage))
+		update_idle_power_usage(new_value)
+		return TRUE
+	else if(var_name == NAMEOF(src, active_power_usage))
+		update_active_power_usage(new_value)
+		return TRUE
+	return ..()
+
 /obj/machinery/proc/operable(var/additional_flags = 0)
 	return !inoperable(additional_flags)
 

code/game/machinery/magnet.dm

@@ -143,7 +143,7 @@
 	// Update power usage:
 	if(on)
 		update_use_power(USE_POWER_ACTIVE)
-		active_power_usage = electricity_level*15
+		update_active_power_usage(electricity_level * 15)
 	else
 		update_use_power(USE_POWER_OFF)
 

code/game/machinery/pda_multicaster.dm

@@ -77,15 +77,15 @@
 		if(stat & (BROKEN|NOPOWER|EMPED))
 			on = 0
 			update_PDAs(1) // 1 being to turn off.
-			idle_power_usage = 0
+			update_idle_power_usage(0)
 		else
 			on = 1
 			update_PDAs(0)
-			idle_power_usage = 750
+			update_idle_power_usage(750)
 	else
 		on = 0
 		update_PDAs(1)
-		idle_power_usage = 0
+		update_idle_power_usage(0)
 	update_icon()
 
 /obj/machinery/pda_multicaster/process()

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, "<span class='notice'>You activate the beacon. The supply drop will be dispatched soon.</span>")
 
 /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, "<span class='notice'>You deactivate the beacon.</span>")
 

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()
 	..()

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)

code/modules/overmap/ships/computers/computer_shims.dm

@@ -20,9 +20,9 @@
 /obj/machinery/proc/change_power_consumption(new_power_consumption, use_power_mode = USE_POWER_IDLE)
 	switch(use_power_mode)
 		if(USE_POWER_IDLE)
-			idle_power_usage = new_power_consumption
+			update_idle_power_usage(new_power_consumption)
 		if(USE_POWER_ACTIVE)
-			active_power_usage = new_power_consumption
+			update_active_power_usage(new_power_consumption)
 	// No need to do anything else in our power scheme.
 
 // Defining directly here to avoid conflicts with existing set_broken procs in our codebase that behave differently.

code/modules/power/fusion/core/_core.dm

@@ -60,7 +60,7 @@ var/list/fusion_cores = list()
 	if(href_list["str"])
 		var/dif = text2num(href_list["str"])
 		field_strength = min(max(field_strength + dif, MIN_FIELD_STR), MAX_FIELD_STR)
-		active_power_usage = 500 * field_strength
+		update_active_power_usage(500 * field_strength)
 		if(owned_field)
 			owned_field.ChangeFieldStrength(field_strength)
 
@@ -96,7 +96,7 @@ var/list/fusion_cores = list()
 /obj/machinery/power/fusion_core/proc/set_strength(var/value)
 	value = CLAMP(value, MIN_FIELD_STR, MAX_FIELD_STR)
 	field_strength = value
-	active_power_usage = 5 * value
+	update_active_power_usage(5 * value)
 	if(owned_field)
 		owned_field.ChangeFieldStrength(value)
 

code/modules/power/fusion/gyrotron/gyrotron.dm

@@ -22,7 +22,7 @@ var/list/gyrotrons = list()
 
 /obj/machinery/power/emitter/gyrotron/Initialize()
 	gyrotrons += src
-	active_power_usage = mega_energy * 50000
+	update_active_power_usage(mega_energy * 50000)
 	default_apply_parts()
 	. = ..()
 
@@ -31,7 +31,7 @@ var/list/gyrotrons = list()
 	return ..()
 
 /obj/machinery/power/emitter/gyrotron/process()
-	active_power_usage = mega_energy * 50000
+	update_active_power_usage(mega_energy * 50000)
 	. = ..()
 
 /obj/machinery/power/emitter/gyrotron/get_rand_burst_delay()

code/modules/power/fusion/gyrotron/gyrotron_control.dm

@@ -75,7 +75,7 @@
 			to_chat(usr, "<span class='warning'>That's not a valid number.</span>")
 			return 1
 		G.mega_energy = CLAMP(new_val, 1, 50)
-		G.active_power_usage = G.mega_energy * 1500
+		G.update_active_power_usage(G.mega_energy * 1500)
 		updateUsrDialog()
 		return 1
 

code/modules/power/lighting.dm

@@ -391,14 +391,14 @@ 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
 		update_use_power(USE_POWER_IDLE)
 		set_light(0)
 
-	active_power_usage = ((light_range * light_power) * LIGHTING_POWER_FACTOR)
+	update_active_power_usage((light_range * light_power) * LIGHTING_POWER_FACTOR)
 
 
 /obj/machinery/light/attack_generic(var/mob/user, var/damage)

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -24,7 +24,7 @@
 /obj/machinery/particle_accelerator/control_box/New()
 	wires = new(src)
 	connected_parts = list()
-	active_power_usage = initial(active_power_usage) * (strength + 1)
+	update_active_power_usage(initial(active_power_usage) * (strength + 1))
 	..()
 
 /obj/machinery/particle_accelerator/control_box/Destroy()

code/modules/research/server.dm

@@ -31,7 +31,7 @@
 	var/tot_rating = 0
 	for(var/obj/item/weapon/stock_parts/SP in src)
 		tot_rating += SP.rating
-	idle_power_usage /= max(1, tot_rating)
+	update_idle_power_usage(initial(idle_power_usage) / max(1, tot_rating))
 
 /obj/machinery/r_n_d/server/Initialize()
 	. = ..()

code/modules/shieldgen/emergency_shield.dm

@@ -153,9 +153,10 @@
 
 	create_shields()
 
-	idle_power_usage = 0
+	var/new_power_usage = 0
 	for(var/obj/machinery/shield/shield_tile in deployed_shields)
-		idle_power_usage += shield_tile.shield_idle_power
+		new_power_usage += shield_tile.shield_idle_power
+	update_idle_power_usage(new_power_usage)
 	update_use_power(USE_POWER_IDLE)
 
 /obj/machinery/shieldgen/proc/shields_down()
@@ -205,7 +206,7 @@
 				new_power_usage += shield_tile.shield_idle_power
 
 			if (new_power_usage != idle_power_usage)
-				idle_power_usage = new_power_usage
+				update_idle_power_usage(new_power_usage)
 				use_power(0)
 
 			check_delay = 60