diff --git a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm index 4e126025bc..1c308a0e0b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm +++ b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm @@ -9,7 +9,7 @@ anchored = 1 density = 1 power_channel = EQUIP - use_power = 1 + use_power = USE_POWER_IDLE idle_power_usage = 100 // Minimal lights to keep algae alive active_power_usage = 5000 // Powerful grow lights to stimulate oxygen production //power_rating = 7500 //7500 W ~ 10 HP @@ -57,10 +57,10 @@ ..() recent_moles_transferred = 0 - if(inoperable() || use_power < 2) + if(inoperable() || use_power < USE_POWER_ACTIVE) ui_error = null update_icon() - if(use_power == 1) + if(use_power == USE_POWER_IDLE) last_power_draw = idle_power_usage else last_power_draw = 0 @@ -113,7 +113,7 @@ update_icon() /obj/machinery/atmospherics/binary/algae_farm/update_icon() - if(inoperable() || !anchored || use_power < 2) + if(inoperable() || !anchored || use_power < USE_POWER_ACTIVE) icon_state = "algae-off" else if(recent_moles_transferred >= moles_per_tick) icon_state = "algae-full" @@ -214,13 +214,13 @@ // Queue management can be done even while busy if(href_list["activate"]) - update_use_power(2) + update_use_power(USE_POWER_ACTIVE) update_icon() updateUsrDialog() return if(href_list["deactivate"]) - update_use_power(1) + update_use_power(USE_POWER_IDLE) update_icon() updateUsrDialog() return diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm index 0d4f3b550f..90916c82ca 100644 --- a/code/game/machinery/airconditioner_vr.dm +++ b/code/game/machinery/airconditioner_vr.dm @@ -10,7 +10,7 @@ density = 1 anchored = 0 - use_power = 0 //is powered directly from cables + use_power = USE_POWER_OFF //is powered directly from cables active_power_usage = 150 KILOWATTS //BIG POWER idle_power_usage = 500 diff --git a/code/game/machinery/atmoalter/pump_vr.dm b/code/game/machinery/atmoalter/pump_vr.dm index 79e6610279..ce1376503a 100644 --- a/code/game/machinery/atmoalter/pump_vr.dm +++ b/code/game/machinery/atmoalter/pump_vr.dm @@ -5,7 +5,7 @@ anchored = 1 volume = 500000 - use_power = 1 + use_power = USE_POWER_IDLE idle_power_usage = 50 //internal circuitry, friction losses and stuff active_power_usage = 1000 // Blowers running power_rating = 100000 //100 kW ~ 135 HP diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index 3e5d4eb5d0..fb5b2819c0 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -210,7 +210,7 @@ /obj/machinery/bomb_tester/proc/start_simulating() simulating = 1 - update_use_power(2) + update_use_power(USE_POWER_ACTIVE) simulation_started = world.time update_icon() switch(sim_mode) @@ -352,7 +352,7 @@ /obj/machinery/bomb_tester/proc/simulation_finish(cancelled = 0) simulating = 0 - update_use_power(1) + update_use_power(USE_POWER_IDLE) update_icon() if(test_canister && test_canister.anchored && !test_canister.connected_port) test_canister.anchored = 0 diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 72bd5b7300..9df92aa209 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -4,7 +4,7 @@ desc = "Small wall-mounted chime triggered by a doorbell" icon = 'icons/obj/machines/doorbell_vr.dmi' icon_state = "dbchime-standby" - use_power = 1 + use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 200 anchored = 1 @@ -89,7 +89,7 @@ desc = "A doorbell, press to chime." icon = 'icons/obj/machines/doorbell_vr.dmi' icon_state = "doorbell-standby" - use_power = 0 + use_power = USE_POWER_OFF /obj/machinery/button/doorbell/New(var/loc, var/dir, var/building = 0) ..() diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm index ce4fa5b86c..7763e28f1a 100644 --- a/code/game/machinery/partslathe_vr.dm +++ b/code/game/machinery/partslathe_vr.dm @@ -23,7 +23,7 @@ circuit = /obj/item/weapon/circuitboard/partslathe anchored = 1 density = 1 - use_power = 1 + use_power = USE_POWER_IDLE idle_power_usage = 30 active_power_usage = 5000 @@ -155,7 +155,7 @@ var/datum/category_item/partslathe/D = queue[1] if(canBuild(D)) busy = 1 - update_use_power(2) + update_use_power(USE_POWER_ACTIVE) progress += speed if(progress >= D.time) build(D) @@ -165,7 +165,7 @@ else if(busy) visible_message("\icon [src] flashes: insufficient materials: [getLackingMaterials(D)].") busy = 0 - update_use_power(1) + update_use_power(USE_POWER_IDLE) update_icon() playsound(src.loc, 'sound/machines/chime.ogg', 50, 0) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 0d8e9603b6..1312c0cc3b 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -140,11 +140,11 @@ var/obj/item/ammo_casing/microbattery/batt = charging if(batt.shots_left >= initial(batt.shots_left)) icon_state = icon_state_charged - update_use_power(1) + update_use_power(USE_POWER_IDLE) else icon_state = icon_state_charging batt.shots_left++ - update_use_power(2) + update_use_power(USE_POWER_ACTIVE) return //VOREStation Add End diff --git a/code/modules/rogueminer_vr/zone_console.dm b/code/modules/rogueminer_vr/zone_console.dm index f70031b197..be367629ca 100644 --- a/code/modules/rogueminer_vr/zone_console.dm +++ b/code/modules/rogueminer_vr/zone_console.dm @@ -9,7 +9,7 @@ icon_keyboard = "tech_key" icon_screen = "request" light_color = "#315ab4" - use_power = 1 + use_power = USE_POWER_IDLE idle_power_usage = 250 active_power_usage = 500 circuit = /obj/item/weapon/circuitboard/roguezones diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index c2a61b833b..91b5c19dc2 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/telescience.dmi' icon_state = "qpad-idle" anchored = TRUE - use_power = 1 + use_power = USE_POWER_IDLE idle_power_usage = 200 active_power_usage = 5000 circuit = /obj/item/weapon/circuitboard/quantumpad diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index e3f1c91157..a5ee8cbd93 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/telescience.dmi' icon_state = "pad-idle" anchored = 1 - use_power = 1 + use_power = USE_POWER_IDLE circuit = /obj/item/weapon/circuitboard/telesci_pad idle_power_usage = 200 active_power_usage = 5000 diff --git a/code/modules/vore/weight/fitness_machines_vr.dm b/code/modules/vore/weight/fitness_machines_vr.dm index 82d2b9910b..733cb2faca 100644 --- a/code/modules/vore/weight/fitness_machines_vr.dm +++ b/code/modules/vore/weight/fitness_machines_vr.dm @@ -3,7 +3,7 @@ desc = "A utility often used to lose weight." icon = 'icons/obj/machines/fitness_machines_vr.dmi' anchored = 1 - use_power = 0 + use_power = USE_POWER_OFF idle_power_usage = 0 active_power_usage = 0 var/messages @@ -88,7 +88,7 @@ icon_state = "scale" desc = "A scale used to measure ones weight relative to their size and species." anchored = 1 // Set to 0 when we can construct or dismantle these. - use_power = 0 + use_power = USE_POWER_OFF idle_power_usage = 0 active_power_usage = 0 diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 195c84d81f..af5e75f0e0 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -24,7 +24,7 @@ music = list('sound/music/elevator.ogg') // Woo elevator music! /obj/machinery/atmospherics/unary/vent_pump/positive - use_power = 1 + use_power = USE_POWER_IDLE icon_state = "map_vent_out" external_pressure_bound = ONE_ATMOSPHERE * 1.1