diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index c11a0421bda..5b09cc250c5 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/binary dir = SOUTH initialize_directions = SOUTH|NORTH - use_power = 1 + use_power = IDLE_POWER_USE var/datum/gas_mixture/air1 var/datum/gas_mixture/air2 @@ -150,4 +150,4 @@ /obj/machinery/atmospherics/binary/process_atmos() ..() - return parent1 && parent2 \ No newline at end of file + return parent1 && parent2 diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 0eed9729f87..a3903f278fb 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -5,7 +5,7 @@ name = "omni device" icon = 'icons/atmos/omni_devices.dmi' icon_state = "base" - use_power = 1 + use_power = IDLE_POWER_USE initialize_directions = 0 can_unwrench = 1 @@ -299,4 +299,4 @@ for(var/datum/omni_port/port in ports) if(!port.parent) return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index e750256b0df..c0787a95612 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/trinary dir = SOUTH initialize_directions = SOUTH|NORTH|WEST - use_power = 1 + use_power = IDLE_POWER_USE var/on = 0 @@ -209,4 +209,4 @@ /obj/machinery/atmospherics/trinary/process_atmos() ..() - return parent1 && parent2 && parent3 \ No newline at end of file + return parent1 && parent2 && parent3 diff --git a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm index 39441f8ed87..51415223de2 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/cold_sink.dmi' icon_state = "on_cool" density = 1 - use_power = 1 + use_power = IDLE_POWER_USE name = "cold sink" desc = "Cools gas when connected to pipe network" @@ -39,4 +39,4 @@ if(abs(old_temperature-air_contents.temperature) > 1) parent.update = 1 - return 1 \ No newline at end of file + return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm index 2b0cbc14277..31eb7305ded 100644 --- a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/cold_sink.dmi' icon_state = "intact_off" density = 1 - use_power = 1 + use_power = IDLE_POWER_USE name = "heat reservoir" desc = "Heats gas when connected to pipe network" @@ -38,4 +38,4 @@ if(abs(old_temperature-air_contents.temperature) > 1) parent.update = 1 - return 1 \ No newline at end of file + return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index fe5b6a0a445..345afd9921e 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/unary/outlet_injector icon = 'icons/atmos/injector.dmi' icon_state = "map_injector" - use_power = 1 + use_power = IDLE_POWER_USE layer = 3 can_unwrench = 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 99eeb1883ea..1f2670371f8 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -8,7 +8,7 @@ name = "air vent" desc = "Has a valve and pump attached to it" - use_power = 1 + use_power = IDLE_POWER_USE can_unwrench = 1 var/open = 0 diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 11b1fc0f920..8b5c4b2afb2 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -7,7 +7,7 @@ name = "air scrubber" desc = "Has a valve and pump attached to it" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 60 diff --git a/code/ATMOSPHERICS/pipes/pipe.dm b/code/ATMOSPHERICS/pipes/pipe.dm index 48c482ac906..4cd51e66b67 100644 --- a/code/ATMOSPHERICS/pipes/pipe.dm +++ b/code/ATMOSPHERICS/pipes/pipe.dm @@ -4,7 +4,7 @@ var/volume = 0 force = 20 layer = 2.4 //under wires with their 2.44 - use_power = 0 + use_power = NO_POWER_USE can_unwrench = 1 var/alert_pressure = 80*ONE_ATMOSPHERE //minimum pressure before check_pressure(...) should be called diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 54e56da5a64..c206cc7aab8 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -56,7 +56,7 @@ icon_state = "scanner_open" density = 1 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 50 active_power_usage = 300 interact_offline = 1 @@ -359,7 +359,7 @@ var/obj/item/disk/data/disk = null var/selected_menu_key = null anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 400 var/waiting_for_user_input=0 // Fix for #274 (Mash create block injector without answering dialog to make unlimited injectors) - N3X diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 6b78a31dac0..54b9ecc3fc5 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -19,7 +19,7 @@ var/bomb_set var/removal_stage = 0 // 0 is no removal, 1 is covers removed, 2 is covers open, 3 is sealant open, 4 is unwrenched, 5 is removed from bolts. var/lastentered var/is_syndicate = 0 - use_power = 0 + use_power = NO_POWER_USE unacidable = 1 var/previous_level = "" var/datum/wires/nuclearbomb/wires = null diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 79fd53e5083..f1171177c42 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -6,7 +6,7 @@ level = 1 // underfloor layer = 2.5 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 0 var/syndicate = 0 var/area_bypass = FALSE @@ -77,4 +77,4 @@ /obj/machinery/bluespace_beacon/syndicate/Destroy() if(mycomputer) mycomputer.mybeacon = null - return ..() \ No newline at end of file + return ..() diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index dc06a13e076..5fb11e932c2 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -5,7 +5,7 @@ density = 1 var/min_temperature = 0 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE current_heat_capacity = 1000 layer = 3 armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 360d5cc5aff..49ab34601b5 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -5,7 +5,7 @@ icon_state = "table2-idle" density = 1 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 1 active_power_usage = 5 var/mob/living/carbon/human/victim = null diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index de32918c068..e9201838763 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -75,7 +75,7 @@ icon = 'icons/obj/monitors.dmi' icon_state = "alarm0" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 4 active_power_usage = 8 power_channel = ENVIRON diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 9ad575f74d7..78b94f969fd 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -74,7 +74,7 @@ var/datum/canister_icons/canister_icon_container = new() pressure_resistance = 7*ONE_ATMOSPHERE var/temperature_resistance = 1000 + T0C volume = 1000 - use_power = 0 + use_power = NO_POWER_USE interact_offline = 1 var/release_log = "" var/busy = 0 diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 03fa12a1c26..d3d23e96bba 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -10,7 +10,7 @@ var/frequency = 0 var/id var/id_tag - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 5 req_one_access_txt = "24;10" diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 34088a6314c..dfecc3a4409 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -1,6 +1,6 @@ /obj/machinery/portable_atmospherics name = "atmoalter" - use_power = 0 + use_power = NO_POWER_USE armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100) var/datum/gas_mixture/air_contents = new diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 81ee03c5ee8..a0e9ee978dd 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -21,7 +21,7 @@ var/hack_wire var/disable_wire var/shock_wire - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 var/busy = 0 diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 5382c9ec429..a76bd387ac7 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -12,7 +12,7 @@ var/active = 0 settagwhitelist = list("id_tag", "logic_id_tag") anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 var/range = 7 @@ -162,7 +162,7 @@ var/id = null var/active = 0 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 @@ -201,4 +201,4 @@ sleep(50) icon_state = "launcherbtt" - active = 0 \ No newline at end of file + active = 0 diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index e555ee91ce8..07f22d8373e 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -3,7 +3,7 @@ desc = "It's used to monitor rooms." icon = 'icons/obj/monitors.dmi' icon_state = "camera" - use_power = 2 + use_power = ACTIVE_POWER_USE idle_power_usage = 5 active_power_usage = 10 layer = WALL_OBJ_LAYER diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 6b728f2a20b..d85a89606ea 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/power.dmi' icon_state = "ccharger0" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 60 power_channel = EQUIP @@ -123,4 +123,4 @@ use_power(200) //this used to use CELLRATE, but CELLRATE is fucking awful. feel free to fix this properly! charging.give(175) //inefficiency. - updateicon() \ No newline at end of file + updateicon() diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index cf34302f118..5d5e6bd9511 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -515,7 +515,7 @@ var/eventstarted = 0 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 6 power_channel = ENVIRON diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index cfddc393875..9afe0113cc4 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -4,7 +4,7 @@ icon_state = "computer" density = 1 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 300 active_power_usage = 300 var/obj/item/circuitboard/circuit = null //if circuit==null, computer can't disassembly diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index f3f4ec8fc3d..4efdcb69ee8 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -3,7 +3,7 @@ desc = "Used to monitor active health sensors built into most of the crew's uniforms." icon_keyboard = "med_key" icon_screen = "crew" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 250 active_power_usage = 500 light_color = LIGHT_COLOR_DARKBLUE @@ -33,4 +33,4 @@ crew_monitor.ui_interact(user, ui_key, ui, force_open) /obj/machinery/computer/crew/interact(mob/user) - crew_monitor.ui_interact(user) \ No newline at end of file + crew_monitor.ui_interact(user) diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index 08f7a45221d..2fa4e6f1177 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -3,7 +3,7 @@ desc = "Used to monitor power levels across the station." icon_screen = "power" icon_keyboard = "power_key" - use_power = 2 + use_power = ACTIVE_POWER_USE idle_power_usage = 20 active_power_usage = 80 light_color = LIGHT_COLOR_ORANGE diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 4c437be1146..f7582213239 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -4,7 +4,7 @@ icon_state = "box_0" density = 1 anchored = 1 - use_power = 0 + use_power = NO_POWER_USE var/obj/item/circuitboard/circuit = null var/list/components = null var/list/req_components = null diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 00cddbb9c23..879773c3850 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -27,7 +27,7 @@ */ anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 @@ -62,7 +62,7 @@ req_access = list() req_one_access = list() playsound(loc, "sparks", 100, 1) - + /obj/machinery/door_control/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) return attack_hand(user) diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm index 52b11da599b..1519981dfc7 100644 --- a/code/game/machinery/dye_generator.dm +++ b/code/game/machinery/dye_generator.dm @@ -4,7 +4,7 @@ icon_state = "barbervend" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 40 var/dye_color = "#FFFFFF" diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 889263da2f8..23ee6e19403 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -4,7 +4,7 @@ name = "Embedded Controller" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 var/on = 1 diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index a37764f90ba..9528b527d6e 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -13,7 +13,7 @@ FIRE ALARM var/lockdownbyai = 0 anchored = 1.0 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100) - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 6 power_channel = ENVIRON @@ -281,7 +281,7 @@ Just a object used in constructing fire alarms var/timing = 0.0 var/lockdownbyai = 0 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 6 diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 7a13b0bf796..23eafe8874b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -121,7 +121,7 @@ var/id = null var/active = 0 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/gameboard.dm b/code/game/machinery/gameboard.dm index 526a935cf90..ab93e69f36d 100644 --- a/code/game/machinery/gameboard.dm +++ b/code/game/machinery/gameboard.dm @@ -5,7 +5,7 @@ desc = "A holographic table allowing the crew to have fun(TM) on boring shifts! One player per board." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE var/cooling_down = 0 light_color = LIGHT_COLOR_LIGHTBLUE @@ -100,4 +100,4 @@ if(default_deconstruction_crowbar(I, ignore_panel = TRUE)) return else - return ..() \ No newline at end of file + return ..() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 492d2fe5c32..405182d8874 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -40,7 +40,7 @@ var/list/holopads = list() desc = "It's a floor-mounted device for projecting holographic images." icon_state = "holopad0" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 layer = TURF_LAYER+0.1 //Preventing mice and drones from sneaking under them. diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index 4958cdf60f6..713e29abf8a 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -41,7 +41,7 @@ var/id = null var/active = 0 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 22d1177c437..87ec7974711 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -7,7 +7,7 @@ var/id = null var/on = 1.0 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index fcf8de24ca5..6f080b8351b 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -100,7 +100,7 @@ Class Procs: layer = BELOW_OBJ_LAYER var/stat = 0 var/emagged = 0 - var/use_power = 1 + var/use_power = IDLE_POWER_USE //0 = dont run the auto //1 = run auto, use idle //2 = run auto, use active @@ -210,9 +210,9 @@ Class Procs: /obj/machinery/proc/auto_use_power() if(!powered(power_channel)) return 0 - if(use_power == 1) + if(use_power == IDLE_POWER_USE) use_power(idle_power_usage,power_channel, 1) - else if(use_power >= 2) + else if(use_power >= ACTIVE_POWER_USE) use_power(active_power_usage,power_channel, 1) return 1 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 0ff8847a8d8..09774a6d600 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -13,7 +13,7 @@ level = 1 // underfloor layer = 2.5 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 50 var/freq = 1449 // radio frequency @@ -151,10 +151,10 @@ // Update power usage: if(on) - use_power = 2 + use_power = ACTIVE_POWER_USE active_power_usage = electricity_level*15 else - use_power = 0 + use_power = NO_POWER_USE // Overload conditions: @@ -199,7 +199,7 @@ icon_state = "airlock_control_standby" density = 1 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 45 var/frequency = 1449 var/code = 0 @@ -404,26 +404,3 @@ rpath += copytext(path, i, i+1) // else, add to list // there doesn't HAVE to be separators but it makes paths syntatically visible - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 8021816cb40..8bc5976d638 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "mass_driver" anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 50 @@ -215,4 +215,4 @@ return src.dir = turn(src.dir, -90) - return \ No newline at end of file + return diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 9d44ac09231..53e406cf433 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -9,7 +9,7 @@ icon_state = "turretCover" anchored = 1 density = 0 - use_power = 1 //this turret uses and requires power + use_power = IDLE_POWER_USE //this turret uses and requires power idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power power_channel = EQUIP //drains power from the EQUIPMENT channel @@ -997,7 +997,7 @@ var/list/turret_icons syndicate = 1 installation = null always_up = 1 - use_power = 0 + use_power = NO_POWER_USE has_cover = 0 raised = 1 scan_range = 9 diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index fe46d2746c8..672402ac351 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/telescience.dmi' icon_state = "qpad-idle" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 200 active_power_usage = 5000 var/teleport_cooldown = 400 //30 seconds base due to base parts diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index abc8d137679..8c061800020 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -4,7 +4,7 @@ icon_state = "recharger0" desc = "A charging dock for energy based weaponry." anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 4 active_power_usage = 250 var/obj/item/charging = null @@ -48,7 +48,7 @@ return 1 G.forceMove(src) charging = G - use_power = 2 + use_power = ACTIVE_POWER_USE update_icon() else to_chat(user, "[src] isn't connected to anything!") @@ -66,7 +66,7 @@ charging.forceMove(loc) user.put_in_hands(charging) charging = null - use_power = 1 + use_power = IDLE_POWER_USE update_icon() /obj/machinery/recharger/attack_tk(mob/user) @@ -74,7 +74,7 @@ charging.update_icon() charging.forceMove(loc) charging = null - use_power = 1 + use_power = IDLE_POWER_USE update_icon() /obj/machinery/recharger/process() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 6900e7b062e..7e3bafbdc39 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -4,7 +4,7 @@ icon_state = "borgcharger0" density = 1 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 1000 var/mob/occupant = null @@ -177,7 +177,7 @@ occupant.forceMove(loc) occupant = null build_icon() - use_power = 1 + use_power = IDLE_POWER_USE return /obj/machinery/recharge_station/proc/restock_modules() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 009241149bf..b655635ba1a 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -322,7 +322,7 @@ var/obj/structure/cable/attached // the attached cable var/storedpower = 0 flags = CONDUCT - use_power = 0 + use_power = NO_POWER_USE /obj/machinery/shieldwallgen/proc/power() if(!anchored) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index ebf3cfeadf9..94d0921b946 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -16,7 +16,7 @@ name = "status display" anchored = 1 density = 0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 var/mode = 1 // 0 = Blank // 1 = Shuttle timer @@ -280,4 +280,4 @@ #undef FONT_COLOR #undef WARNING_FONT_COLOR #undef FONT_STYLE -#undef SCROLL_SPEED \ No newline at end of file +#undef SCROLL_SPEED diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 64e387fb731..10451c758be 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -15,7 +15,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept desc = "A dish-shaped machine used to broadcast processed subspace signals." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 25 machinetype = 5 circuitboard = /obj/item/circuitboard/telecomms/broadcaster @@ -113,7 +113,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept desc = "A compact machine used for portable subspace telecommuniations processing." density = 1 anchored = 1 - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 0 machinetype = 6 var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel @@ -167,15 +167,15 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept old_type = SYNDICATE_RADIO_TYPE if(new_freq == antag_freq) new_type = SYNDICATE_RADIO_TYPE - + for(var/cent_freq in CENT_FREQS) if(old_freq == cent_freq) old_type = CENTCOMM_RADIO_TYPE if(new_freq == cent_freq) new_type = CENTCOMM_RADIO_TYPE - + return new_type > old_type - + /** Here is the big, bad function that broadcasts a message given the appropriate @@ -246,11 +246,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/bad_connection = FALSE var/datum/radio_frequency/new_connection = connection - + if(connection.frequency != display_freq) bad_connection = Is_Bad_Connection(connection.frequency, display_freq) new_connection = radio_controller.return_frequency(display_freq) - + var/list/obj/item/radio/radios = list() // --- Broadcast only to intercom devices --- diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 8cf29f6b8db..0a12b637a39 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -35,7 +35,7 @@ hide = 1 toggled = 1 //anchored = 1 - use_power = 0 + use_power = NO_POWER_USE //idle_power_usage = 0 autolinkers = list("c_relay") @@ -51,7 +51,7 @@ /obj/machinery/telecomms/hub/preset_cent id = "CentComm Hub" network = "tcommsat" - use_power = 0 + use_power = NO_POWER_USE autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", "e_relay", "centcomm", "receiverCent", "broadcasterCent") @@ -83,7 +83,7 @@ /obj/machinery/telecomms/receiver/preset_cent id = "CentComm Receiver" network = "tcommsat" - use_power = 0 + use_power = NO_POWER_USE autolinkers = list("receiverCent") freq_listening = list(ERT_FREQ, DTH_FREQ) @@ -121,7 +121,7 @@ /obj/machinery/telecomms/bus/preset_cent id = "CentComm Bus" network = "tcommsat" - use_power = 0 + use_power = NO_POWER_USE freq_listening = list(ERT_FREQ, DTH_FREQ) autolinkers = list("processorCent", "centcomm") @@ -150,7 +150,7 @@ /obj/machinery/telecomms/processor/preset_cent id = "CentComm Processor" network = "tcommsat" - use_power = 0 + use_power = NO_POWER_USE autolinkers = list("processorCent") //Servers @@ -208,7 +208,7 @@ /obj/machinery/telecomms/server/presets/centcomm id = "CentComm Server" freq_listening = list(ERT_FREQ, DTH_FREQ) - use_power = 0 + use_power = NO_POWER_USE autolinkers = list("centcomm") //Broadcasters @@ -230,5 +230,5 @@ /obj/machinery/telecomms/broadcaster/preset_cent id = "CentComm Broadcaster" network = "tcommsat" - use_power = 0 - autolinkers = list("broadcasterCent") \ No newline at end of file + use_power = NO_POWER_USE + autolinkers = list("broadcasterCent") diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 0b9b1449137..c74d5364919 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -195,7 +195,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() desc = "This machine has a dish-like shape and green lights. It is designed to detect and process subspace radio activity." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 30 machinetype = 1 circuitboard = /obj/item/circuitboard/telecomms/receiver @@ -251,7 +251,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() desc = "A mighty piece of hardware used to send/receive massive amounts of data." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 80 machinetype = 7 circuitboard = /obj/item/circuitboard/telecomms/hub @@ -285,7 +285,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() desc = "A mighty piece of hardware used to send massive amounts of data far away." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 30 machinetype = 8 circuitboard = /obj/item/circuitboard/telecomms/relay @@ -336,7 +336,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() desc = "A mighty piece of hardware used to send massive amounts of data quickly." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 50 machinetype = 2 circuitboard = /obj/item/circuitboard/telecomms/bus @@ -388,7 +388,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() desc = "This machine is used to process large quantities of information." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 30 machinetype = 3 circuitboard = /obj/item/circuitboard/telecomms/processor @@ -425,7 +425,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() desc = "A machine used to store data and network statistics." density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 15 machinetype = 4 circuitboard = /obj/item/circuitboard/telecomms/server diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 702d1eee8a2..53148d9de6d 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -269,7 +269,7 @@ desc = "It's the hub of a teleporting machine." icon_state = "tele0" var/accurate = 0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 2000 var/obj/machinery/teleport/station/power_station @@ -389,7 +389,7 @@ desc = "A teleporter with the target pre-set on the circuit board." icon_state = "tele0" var/recalibrating = 0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 2000 @@ -466,7 +466,7 @@ desc = "The power control station for a bluespace teleporter." icon_state = "controller" var/engaged = 0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 2000 var/obj/machinery/computer/teleporter/teleporter_console diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 823727d46ef..3b911bb25c2 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -43,7 +43,7 @@ var/icon_deny //Icon_state when denying access // Power - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 var/vend_power_usage = 150 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d0af747dc64..75a47d1c324 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -5,7 +5,7 @@ desc = "Nothing is being built." density = TRUE anchored = TRUE - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 active_power_usage = 5000 var/time_coeff = 1 @@ -151,10 +151,10 @@ GET_COMPONENT(materials, /datum/component/material_container) materials.use_amount(res_coef) overlays += "fab-active" - use_power = 2 + use_power = ACTIVE_POWER_USE updateUsrDialog() sleep(get_construction_time_w_coeff(D)) - use_power = 1 + use_power = IDLE_POWER_USE overlays -= "fab-active" desc = initial(desc) @@ -464,4 +464,4 @@ /obj/machinery/mecha_part_fabricator/robot name = "Robotic Fabricator" - part_sets = list("Cyborg") \ No newline at end of file + part_sets = list("Cyborg") diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 179615dada3..31bfadee7d7 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -243,7 +243,7 @@ icon_state = "shower" density = 0 anchored = 1 - use_power = 0 + use_power = NO_POWER_USE var/on = 0 var/obj/effect/mist/mymist = null var/ismist = 0 //needs a var so we can make it linger~ @@ -756,4 +756,3 @@ qdel(src) if(prob(50)) new /obj/item/stack/sheet/cardboard(T) - diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm index 754841a9471..c3158e9ccba 100644 --- a/code/modules/arcade/arcade_base.dm +++ b/code/modules/arcade/arcade_base.dm @@ -6,7 +6,7 @@ icon_state = "clawmachine_on" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 40 var/tokens = 0 var/freeplay = 0 //for debugging and admin kindness @@ -111,7 +111,7 @@ if(!customer_account) to_chat(user, "Unable to access account: incorrect credentials.") return 0 - + return customer_account.charge(token_price, null, "Purchase of [name] credit", name, name) /obj/machinery/arcade/proc/start_play(mob/user as mob) diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm index 4e2e4e9a0d7..d8666c36617 100644 --- a/code/modules/arcade/prize_counter.dm +++ b/code/modules/arcade/prize_counter.dm @@ -6,7 +6,7 @@ icon_state = "prize_counter-on" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 40 var/tickets = 0 @@ -205,4 +205,4 @@ th.cost.toomuch {background:maroon;} print_tickets() else new /obj/item/stack/tickets(get_turf(src), tickets) - tickets = 0 \ No newline at end of file + tickets = 0 diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index cfbcec7ae64..d6e72f1505c 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -31,7 +31,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null /obj/machinery/gateway/centerstation density = 1 icon_state = "offcenter" - use_power = 1 + use_power = IDLE_POWER_USE //warping vars var/list/linked = list() @@ -169,7 +169,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null /obj/machinery/gateway/centeraway density = 1 icon_state = "offcenter" - use_power = 0 + use_power = NO_POWER_USE var/calibrated = 1 var/list/linked = list() //a list of the connected gateway chunks var/ready = 0 diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm index 966ce6053f6..b0a092b7e7d 100644 --- a/code/modules/awaymissions/mission_code/challenge.dm +++ b/code/modules/awaymissions/mission_code/challenge.dm @@ -28,10 +28,10 @@ anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 0 active_power_usage = 0 active = 1 locked = 1 - state = 2 \ No newline at end of file + state = 2 diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index b26bdba7d92..a4f3b3e0e6a 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -46,7 +46,7 @@ anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE var/chargesa = 1 var/insistinga = 0 @@ -288,4 +288,4 @@ say("How could you betray the Syndicate?") for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list) W.on_alert = TRUE - ..(gibbed) \ No newline at end of file + ..(gibbed) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 52494728155..e43797ef9dd 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -19,7 +19,7 @@ log transactions icon = 'icons/obj/terminals.dmi' icon_state = "atm" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 var/obj/machinery/computer/account_database/linked_db var/datum/money_account/authenticated_account diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm index 62aaf8440bf..802f8f08c54 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm @@ -4,7 +4,7 @@ layer = 2.9 density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 var/on = 0 var/onicon = null diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 1e3c5602a22..bd80823addd 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -20,7 +20,7 @@ var/stealthmode = FALSE var/list/victims = list() - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 500 diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index a58ccc1bb2b..5d758193bae 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -7,7 +7,7 @@ anchored = 1 icon = 'icons/obj/cooking_machines.dmi' icon_state = "icecream_vat" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 var/obj/item/reagent_containers/glass/beaker = null var/useramount = 15 //Last used amount diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm index ec806610601..a10f4e2fdae 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm @@ -6,7 +6,7 @@ layer = 2.9 density = 1 anchored = 0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 pass_flags = PASSTABLE diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index 93b6fdbe8c4..9de98749e42 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -5,7 +5,7 @@ layer = 2.9 density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 flags = OPENCONTAINER diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 9dbcf35b848..8fe5d2cf4d8 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -6,7 +6,7 @@ layer = 2.9 density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 50 var/grinded = 0 @@ -102,4 +102,4 @@ to_chat(user, "The machine's display flashes that it has [grinded] monkey\s worth of material left.") else // I'm not sure if the \s macro works with a word in between; I'll play it safe to_chat(user, "The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded].") - return \ No newline at end of file + return diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven.dm b/code/modules/food_and_drinks/kitchen_machinery/oven.dm index cf27804d823..2827720c12e 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/oven.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/oven.dm @@ -6,7 +6,7 @@ layer = 2.9 density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE var/candy = 0 idle_power_usage = 5 var/on = FALSE //Is it making food already? diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index ad4dcb5e4d8..19c866fae43 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -9,7 +9,7 @@ var/broken = 0 var/processing = 0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 50 var/rating_speed = 1 diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index e3ca42425db..3a905a658d0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -7,7 +7,7 @@ layer = 2.9 density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 var/max_n_of_items = 1500 @@ -227,7 +227,7 @@ if(load(O, user)) user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].") SSnanoui.update_uis(src) - + else if(istype(O, /obj/item/storage/bag)) var/obj/item/storage/bag/P = O var/plants_loaded = 0 @@ -410,7 +410,7 @@ desc = "A wooden contraption, used to dry plant products, food and leather." icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "drying_rack_on" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 200 icon_on = "drying_rack_on" @@ -447,13 +447,13 @@ return 1 if(href_list["dryingOn"]) drying = TRUE - use_power = 2 + use_power = ACTIVE_POWER_USE update_icon() return 1 if(href_list["dryingOff"]) drying = FALSE - use_power = 1 + use_power = IDLE_POWER_USE update_icon() return 1 return 0 @@ -497,10 +497,10 @@ /obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff) if(drying || forceoff) drying = FALSE - use_power = 1 + use_power = IDLE_POWER_USE else drying = TRUE - use_power = 2 + use_power = ACTIVE_POWER_USE update_icon() /obj/machinery/smartfridge/drying_rack/proc/rack_dry() @@ -552,4 +552,4 @@ to_chat(usr, "Access denied.") SSnanoui.update_uis(src) return 0 - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 96553775361..67979b61dd7 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -5,7 +5,7 @@ icon_state = "biogen-empty" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 40 var/processing = 0 var/obj/item/reagent_containers/glass/beaker = null diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 903fec0c1a2..b5bea1fc6b3 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -1008,7 +1008,7 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "soil" density = 0 - use_power = 0 + use_power = NO_POWER_USE wrenchable = 0 /obj/machinery/hydroponics/soil/update_icon_hoses() diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index 59d3a715f32..1e0f73cd995 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -12,7 +12,7 @@ unacidable = 1 burn_state = LAVA_PROOF | FIRE_PROOF pixel_y = -4 - use_power = 0 + use_power = NO_POWER_USE var/memory_saved = FALSE var/list/stored_items = list() var/static/list/blacklist = typecacheof(list(/obj/item/spellbook)) @@ -97,7 +97,7 @@ icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "anomaly_crystal" luminosity = 8 - use_power = 0 + use_power = NO_POWER_USE density = 1 burn_state = LAVA_PROOF | FIRE_PROOF unacidable = 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index cf935b96341..cf9102858bd 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -281,7 +281,7 @@ var/list/ai_verbs_default = list( /obj/machinery/ai_powersupply name="\improper AI power supply" active_power_usage=1000 - use_power = 2 + use_power = ACTIVE_POWER_USE power_channel = EQUIP var/mob/living/silicon/ai/powered_ai = null invisibility = 100 @@ -303,9 +303,9 @@ var/list/ai_verbs_default = list( return if(!powered_ai.anchored) loc = powered_ai.loc - use_power = 0 + use_power = NO_POWER_USE if(powered_ai.anchored) - use_power = 2 + use_power = ACTIVE_POWER_USE /mob/living/silicon/ai/proc/pick_icon() set category = "AI Commands" diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 790ecaa399a..9bf388fe5fe 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -4,7 +4,7 @@ density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 active_power_usage = 5000 diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 5e79c315f42..7f5c1916619 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -889,7 +889,7 @@ Pass a positive integer as an argument to override a bot's default speed. // Machinery to simplify topic and access calls /obj/machinery/bot_core - use_power = 0 + use_power = NO_POWER_USE var/mob/living/simple_animal/bot/owner = null /obj/machinery/bot_core/New(loc) @@ -1106,4 +1106,4 @@ Pass a positive integer as an argument to override a bot's default speed. var/image/I = path[path[1]] if(I) I.icon = null - path.Cut(1, 2) \ No newline at end of file + path.Cut(1, 2) diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index 2ae0c251f20..436070470ea 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -2,7 +2,7 @@ /obj/machinery/ntnet_relay name = "NTNet Quantum Relay" desc = "A very complex router and transmitter capable of connecting electronic devices together. Looks fragile." - use_power = 2 + use_power = ACTIVE_POWER_USE active_power_usage = 10000 //10kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational. Used to be 20 but that actually drained the smes one round idle_power_usage = 100 icon = 'icons/obj/stationobjs.dmi' @@ -38,9 +38,9 @@ /obj/machinery/ntnet_relay/process() if(operable()) - use_power = 2 + use_power = ACTIVE_POWER_USE else - use_power = 1 + use_power = IDLE_POWER_USE update_icon() diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 832f5558cd8..36c4409fb34 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -7,7 +7,7 @@ var/list/global_modular_computers = list() name = "modular computer" desc = "An advanced computer." - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 var/hardware_flag = 0 // A flag that describes this device type var/last_power_usage = 0 // Power usage during last tick diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index ad2fdf38eb1..2b699c36530 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -13,7 +13,7 @@ var/list/alldepartments = list() var/long_range_enabled = 0 // Can we send messages off the station? req_one_access = list(access_lawyer, access_heads, access_armory) - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 30 active_power_usage = 200 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index b096c768ee0..a8a0c8ddd19 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -7,7 +7,7 @@ var/insert_anim = "bigscanner1" anchored = 1 density = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 30 active_power_usage = 200 power_channel = EQUIP diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 3ba1a4b5210..a0df2084b2f 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -47,7 +47,7 @@ desc = "A control terminal for the area electrical systems." icon_state = "apc0" anchored = 1 - use_power = 0 + use_power = NO_POWER_USE req_access = list(access_engine_equip) var/spooky=0 var/area/area diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 8c9ee3eda0d..7bbb5ac20f9 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -4,7 +4,7 @@ icon_state = "teg" anchored = 0 density = 1 - use_power = 0 + use_power = NO_POWER_USE var/obj/machinery/atmospherics/binary/circulator/cold_circ var/obj/machinery/atmospherics/binary/circulator/hot_circ @@ -244,4 +244,4 @@ /obj/machinery/power/generator/power_change() ..() - update_icon() \ No newline at end of file + update_icon() diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 42f7cbde657..8f9d9fb14cd 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -24,7 +24,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 icon = 'icons/obj/machines/gravity_generator.dmi' anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE unacidable = 1 var/sprite_number = 0 @@ -101,7 +101,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 active_power_usage = 3000 power_channel = ENVIRON sprite_number = 8 - use_power = 1 + use_power = IDLE_POWER_USE interact_offline = 1 var/on = 1 var/breaker = 1 @@ -287,7 +287,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 /obj/machinery/gravity_generator/main/proc/set_state(var/new_state) charging_state = POWER_IDLE on = new_state - use_power = on ? 2 : 1 + use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE // Sound the alert if gravity was just enabled or disabled. var/alert = 0 var/area/area = get_area(src) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 708072417e4..403e1808221 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -133,7 +133,7 @@ desc = "A lighting fixture." anchored = 1 layer = 5 // They were appearing under mobs which is a little weird - Ostaf - use_power = 2 + use_power = ACTIVE_POWER_USE idle_power_usage = 2 active_power_usage = 20 power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list @@ -258,10 +258,10 @@ on = 0 set_light(0) else - use_power = 2 + use_power = ACTIVE_POWER_USE set_light(BR, PO, CO) else - use_power = 1 + use_power = IDLE_POWER_USE set_light(0) active_power_usage = (brightness_range * 10) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 2892d0245b2..bf2563fe310 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -6,7 +6,7 @@ icon_state = "portgen0_0" density = 1 anchored = 0 - use_power = 0 + use_power = NO_POWER_USE var/active = 0 var/power_gen = 5000 diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 15b47a47635..0e255a804fe 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -12,7 +12,7 @@ anchored = 1.0 on_blueprints = TRUE var/datum/powernet/powernet = null - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 0 active_power_usage = 0 @@ -297,7 +297,7 @@ //source is an object caused electrocuting (airlock, grille, etc) //No animations will be performed by this proc. /proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0) - if(!istype(M)) + if(!istype(M)) return 0 if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb @@ -305,7 +305,7 @@ var/mob/living/carbon/human/H = M if(H.gloves) var/obj/item/clothing/gloves/G = H.gloves - if(G.siemens_coefficient == 0) + if(G.siemens_coefficient == 0) return 0 //to avoid spamming with insulated glvoes on var/area/source_area diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index d54deb2f6f1..a85d9e880bd 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -8,7 +8,7 @@ var/global/list/rad_collectors = list() anchored = 0 density = 1 req_access = list(access_engine_equip) -// use_power = 0 +// use_power = NO_POWER_USE var/obj/item/tank/plasma/P = null var/last_power = 0 var/active = 0 @@ -148,4 +148,3 @@ var/global/list/rad_collectors = list() flick("ca_deactive", src) update_icons() return - diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 3a5a059d670..0e9bdd8ddf3 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -6,7 +6,7 @@ anchored = 1 density = 0 unacidable = 1 - use_power = 0 + use_power = NO_POWER_USE light_range = 4 layer = OBJ_LAYER + 0.1 var/obj/machinery/field/generator/FG1 = null diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index a6c86d3f2ef..0bcde54af4b 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -7,7 +7,7 @@ density = 1 req_access = list(access_engine_equip) - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 10 active_power_usage = 300 @@ -167,7 +167,7 @@ /* if((severity == 1)&&prob(1)&&prob(1)) if(src.active) src.active = 0 - src.use_power = 1 */ + src.use_power = IDLE_POWER_USE */ return 1 diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 11651ff13fe..0f281c634e3 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -26,7 +26,7 @@ field_generator power level display icon_state = "Field_Gen" anchored = 0 density = 1 - use_power = 0 + use_power = NO_POWER_USE armor = list(melee = 25, bullet = 10, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0) var/const/num_power_levels = 6 // Total number of power level icon has var/power_level = 0 diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 02a015ba6d5..69153cb4d89 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -6,7 +6,7 @@ icon_state = "TheSingGen" anchored = 0 density = 1 - use_power = 0 + use_power = NO_POWER_USE var/energy = 0 var/creation_type = /obj/singularity diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index dfbedc07ad2..c6c6de434c2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -281,7 +281,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin icon_state = "none" anchored = 0 density = 1 - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 0 active_power_usage = 0 var/construction_state = 0 @@ -408,10 +408,10 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(construction_state < 3)//Was taken apart, update state update_state() if(use_power) - use_power = 0 + use_power = NO_POWER_USE construction_state = temp_state if(construction_state >= 3) - use_power = 1 + use_power = IDLE_POWER_USE update_icon() return 1 return 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 42fbb784f49..bf20ef45140 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -6,7 +6,7 @@ reference = "control_box" anchored = 0 density = 1 - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 500 active_power_usage = 10000 construction_state = 0 @@ -42,7 +42,7 @@ /obj/machinery/particle_accelerator/control_box/update_state() if(construction_state < 3) - use_power = 0 + use_power = NO_POWER_USE assembled = 0 active = 0 for(var/obj/structure/particle_accelerator/part in connected_parts) @@ -52,7 +52,7 @@ connected_parts = list() return if(!part_scan()) - use_power = 1 + use_power = IDLE_POWER_USE active = 0 connected_parts = list() @@ -147,9 +147,9 @@ ..() if(stat & NOPOWER) active = 0 - use_power = 0 + use_power = NO_POWER_USE else if(!stat && construction_state <= 3) - use_power = 1 + use_power = IDLE_POWER_USE update_icon() if((stat & NOPOWER) || (!stat && construction_state <= 3)) //Only update the part icons if something's changed (i.e. any of the above condition sets are met). @@ -231,13 +231,13 @@ log_game("PA Control Computer turned ON by [key_name(usr)] in ([x],[y],[z])") use_log += text("\[[time_stamp()]\] [key_name(usr)] has turned on the PA Control Computer.") if(active) - use_power = 2 + use_power = ACTIVE_POWER_USE for(var/obj/structure/particle_accelerator/part in connected_parts) part.strength = strength part.powered = 1 part.update_icon() else - use_power = 1 + use_power = IDLE_POWER_USE for(var/obj/structure/particle_accelerator/part in connected_parts) part.strength = null part.powered = 0 @@ -276,4 +276,4 @@ popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) popup.open() - return \ No newline at end of file + return diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index a2025376e9d..7342c1f26c1 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -8,7 +8,7 @@ icon_state = "sp_base" anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 0 active_power_usage = 0 var/id = 0 @@ -279,7 +279,7 @@ icon_state = "computer" anchored = 1 density = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 250 var/icon_screen = "solar" var/icon_keyboard = "power_key" diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 20f4031a8ce..e4e3275ef26 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -10,7 +10,7 @@ icon_state = "tracker" anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE var/id = 0 var/sun_angle = 0 // sun angle as set by sun datum @@ -82,4 +82,4 @@ icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" w_class = WEIGHT_CLASS_SMALL - origin_tech = "engineering=2;programming=1" \ No newline at end of file + origin_tech = "engineering=2;programming=1" diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 762d442a2a9..4f7e7e9c895 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -8,7 +8,7 @@ desc = "A power-generating treadmill." layer = 2.2 anchored = 1 - use_power = 0 + use_power = NO_POWER_USE var/speed = 0 var/friction = 0.15 // lose this much speed every ptick diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index d4d232d2ed7..cf291fba675 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -4,7 +4,7 @@ anchored = 1 icon = 'icons/obj/chemical.dmi' icon_state = "dispenser" - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 40 var/ui_title = "Chem Dispenser 5000" var/energy = 100 diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 16914c77c4d..2d031d9c2c5 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -4,7 +4,7 @@ anchored = 1 icon = 'icons/obj/chemical.dmi' icon_state = "mixer0b" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 40 var/obj/item/reagent_containers/beaker = null var/desired_temp = 300 @@ -154,4 +154,4 @@ beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list... data["beakerContents"] = beakerContents - return data \ No newline at end of file + return data diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 90f9ed47eec..2a7dac0f48d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -4,7 +4,7 @@ anchored = 1 icon = 'icons/obj/chemical.dmi' icon_state = "mixer0" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 var/obj/item/reagent_containers/beaker = null var/obj/item/storage/pill_bottle/loaded_pill_bottle = null @@ -416,4 +416,4 @@ to_chat(user, "You can't use the [name] while it's panel is opened!") return 1 else - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 8296550d8f9..ee2ac418555 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "mixer0" circuit = /obj/item/circuitboard/pandemic - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 var/temp_html = "" var/wait = null @@ -294,4 +294,4 @@ ..() return else - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index cbf1260c4fd..5948d29e4cd 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -4,7 +4,7 @@ icon_state = "juicer1" layer = 2.9 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 pass_flags = PASSTABLE @@ -446,4 +446,4 @@ var/amount = O.reagents.total_volume O.reagents.trans_to(beaker, amount) if(!O.reagents.total_volume) - remove_object(O) \ No newline at end of file + remove_object(O) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 476028b4532..2b194eedbf1 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -335,7 +335,7 @@ // timed process // charge the gas reservoir and perform flush if ready /obj/machinery/disposal/process() - use_power = 0 + use_power = NO_POWER_USE if(stat & BROKEN) // nothing can happen if broken return @@ -356,13 +356,13 @@ if(stat & NOPOWER) // won't charge if no power return - use_power = 1 + use_power = IDLE_POWER_USE if(mode != 1) // if off or ready, no need to charge return // otherwise charge - use_power = 2 + use_power = ACTIVE_POWER_USE var/atom/L = loc // recharging from loc turf diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index e504216fe38..f6e4f2c0877 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -21,7 +21,7 @@ icon_state = "h_lathe" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE var/recentlyExperimented = 0 var/mob/trackedIan var/mob/trackedRuntime diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 86d507d34de..88ecedbf555 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -50,7 +50,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() name = "Messaging Server" density = 1 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 @@ -199,7 +199,7 @@ var/obj/machinery/blackbox_recorder/blackbox name = "Blackbox Recorder" density = 1 anchored = 1.0 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 var/list/messages = list() //Stores messages of non-standard frequencies @@ -377,4 +377,4 @@ proc/feedback_add_details(var/variable,var/details) if(!FV) return - FV.add_details(details) \ No newline at end of file + FV.add_details(details) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 51b4f8512e1..1e884e35c3a 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/machines/research.dmi' density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE var/busy = 0 var/hacked = 0 var/disabled = 0 @@ -130,4 +130,4 @@ use_power(min(1000, (amount_inserted / 100))) overlays += "[initial(name)]_[stack_name]" sleep(10) - overlays -= "[initial(name)]_[stack_name]" \ No newline at end of file + overlays -= "[initial(name)]_[stack_name]" diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm index da06ce169f3..b5f7540c3f2 100644 --- a/code/modules/security_levels/keycard authentication.dm +++ b/code/modules/security_levels/keycard authentication.dm @@ -17,7 +17,7 @@ var/ert_reason = "Reason for ERT" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 6 power_channel = ENVIRON diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 57142365cc4..c58f4efb300 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -256,7 +256,7 @@ var/obj/machinery/bsa/full/cannon var/notice var/target - use_power = 0 + use_power = NO_POWER_USE circuit = /obj/item/circuitboard/computer/bsa_control icon = 'icons/obj/machines/particle_accelerator3.dmi' icon_state = "control_boxp" diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 38d4fa19e40..09f4ffa7920 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 = IDLE_POWER_USE idle_power_usage = 200 active_power_usage = 5000 var/efficiency @@ -61,7 +61,7 @@ icon = 'icons/obj/telescience.dmi' icon_state = "pad-idle" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 active_power_usage = 500 var/stage = 0