From 9d5e51777b4fe5494b0f26580bedd140d07b969d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 30 Jun 2017 22:41:59 -0500 Subject: [PATCH] use_power var now uses a define to reflect it not being a bool (#1842) --- code/__DEFINES/machines.dm | 7 ++++++- code/game/gamemodes/nuclear/nuclearbomb.dm | 2 +- code/game/machinery/Beacon.dm | 2 +- code/game/machinery/autolathe.dm | 2 +- code/game/machinery/buttons.dm | 2 +- code/game/machinery/camera/camera.dm | 2 +- code/game/machinery/cell_charger.dm | 2 +- code/game/machinery/computer/computer.dm | 2 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/dna_console.dm | 2 +- code/game/machinery/dna_scanner.dm | 2 +- code/game/machinery/doppler_array.dm | 2 +- .../embedded_controller/access_controller.dm | 2 +- code/game/machinery/firealarm.dm | 2 +- code/game/machinery/gulag_item_reclaimer.dm | 2 +- code/game/machinery/gulag_teleporter.dm | 2 +- code/game/machinery/hologram.dm | 5 +++-- code/game/machinery/igniter.dm | 2 +- code/game/machinery/limbgrower.dm | 2 +- code/game/machinery/machinery.dm | 8 ++++---- code/game/machinery/magnet.dm | 8 ++++---- code/game/machinery/mass_driver.dm | 2 +- .../game/machinery/porta_turret/portable_turret.dm | 6 +++--- code/game/machinery/quantum_pad.dm | 2 +- code/game/machinery/recharger.dm | 8 ++++---- code/game/machinery/rechargestation.dm | 6 +++--- code/game/machinery/robot_fabricator.dm | 6 +++--- code/game/machinery/shieldgen.dm | 2 +- code/game/machinery/slotmachine.dm | 2 +- code/game/machinery/status_display.dm | 2 +- code/game/machinery/telecomms/machines/allinone.dm | 2 +- .../machinery/telecomms/machines/broadcaster.dm | 2 +- code/game/machinery/telecomms/machines/bus.dm | 2 +- code/game/machinery/telecomms/machines/hub.dm | 2 +- .../game/machinery/telecomms/machines/processor.dm | 2 +- code/game/machinery/telecomms/machines/receiver.dm | 2 +- code/game/machinery/telecomms/machines/relay.dm | 2 +- code/game/machinery/telecomms/machines/server.dm | 2 +- code/game/machinery/teleporter.dm | 4 ++-- code/game/machinery/wishgranter.dm | 2 +- code/game/mecha/mech_fabricator.dm | 6 +++--- code/game/objects/structures/watercloset.dm | 2 +- code/modules/atmospherics/machinery/airalarm.dm | 2 +- .../components/binary_devices/binary_devices.dm | 2 +- .../components/trinary_devices/trinary_devices.dm | 2 +- .../components/unary_devices/outlet_injector.dm | 2 +- .../unary_devices/portables_connector.dm | 2 +- .../components/unary_devices/thermomachine.dm | 2 +- .../components/unary_devices/vent_pump.dm | 2 +- .../components/unary_devices/vent_scrubber.dm | 2 +- code/modules/atmospherics/machinery/other/meter.dm | 2 +- code/modules/atmospherics/machinery/pipes/pipes.dm | 2 +- .../machinery/portable/portable_atmospherics.dm | 2 +- .../atmospherics/machinery/portable/scrubber.dm | 2 +- code/modules/awaymissions/gateway.dm | 4 ++-- .../modules/awaymissions/mission_code/challenge.dm | 2 +- code/modules/awaymissions/mission_code/wildwest.dm | 2 +- .../kitchen_machinery/deep_fryer.dm | 2 +- .../food_and_drinks/kitchen_machinery/food_cart.dm | 2 +- .../food_and_drinks/kitchen_machinery/gibber.dm | 2 +- .../kitchen_machinery/icecream_vat.dm | 2 +- .../food_and_drinks/kitchen_machinery/juicer.dm | 2 +- .../food_and_drinks/kitchen_machinery/microwave.dm | 2 +- .../kitchen_machinery/monkeyrecycler.dm | 2 +- .../food_and_drinks/kitchen_machinery/processor.dm | 2 +- .../kitchen_machinery/smartfridge.dm | 8 ++++---- code/modules/holodeck/computer_funcs.dm | 4 ++-- code/modules/holodeck/items.dm | 2 +- code/modules/hydroponics/biogenerator.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 2 +- code/modules/mob/living/simple_animal/bot/bot.dm | 2 +- .../simple_animal/hostile/megafauna/colossus.dm | 4 ++-- .../modules/modular_computers/NTNet/NTNet_relay.dm | 6 +++--- .../computers/machinery/modular_computer.dm | 2 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/power/antimatter/control.dm | 8 ++++---- code/modules/power/antimatter/shielding.dm | 2 +- code/modules/power/apc.dm | 2 +- code/modules/power/generator.dm | 2 +- code/modules/power/gravitygenerator.dm | 8 ++++---- code/modules/power/lighting.dm | 6 +++--- code/modules/power/monitor.dm | 6 +++--- code/modules/power/port_gen.dm | 2 +- code/modules/power/power.dm | 2 +- code/modules/power/rtg.dm | 2 +- code/modules/power/singularity/collector.dm | 2 +- .../modules/power/singularity/containment_field.dm | 2 +- code/modules/power/singularity/emitter.dm | 4 ++-- code/modules/power/singularity/field_generator.dm | 2 +- code/modules/power/singularity/generator.dm | 2 +- .../particle_accelerator/particle_control.dm | 14 +++++++------- code/modules/power/smes.dm | 2 +- code/modules/power/solar.dm | 4 ++-- code/modules/power/tracker.dm | 2 +- .../reagents/chemistry/machinery/chem_dispenser.dm | 2 +- .../reagents/chemistry/machinery/chem_heater.dm | 2 +- .../reagents/chemistry/machinery/chem_master.dm | 2 +- .../reagents/chemistry/machinery/reagentgrinder.dm | 2 +- code/modules/research/experimentor.dm | 2 +- code/modules/research/message_server.dm | 4 ++-- code/modules/research/rdmachines.dm | 2 +- .../security_levels/keycard_authentication.dm | 2 +- code/modules/station_goals/bsa.dm | 2 +- 103 files changed, 155 insertions(+), 149 deletions(-) diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 53df769daf..afaa64891d 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -7,6 +7,11 @@ #define STATIC_LIGHT 6 #define STATIC_ENVIRON 7 +//Power use +#define NO_POWER_USE 0 +#define IDLE_POWER_USE 1 +#define ACTIVE_POWER_USE 2 + //bitflags for door switches. #define OPEN 1 @@ -78,4 +83,4 @@ #define SUPERMATTER_WARNING 3 // Ambient temp > CRITICAL_TEMPERATURE OR integrity damaged #define SUPERMATTER_DANGER 4 // Integrity < 50% #define SUPERMATTER_EMERGENCY 5 // Integrity < 25% -#define SUPERMATTER_DELAMINATING 6 // Pretty obvious. \ No newline at end of file +#define SUPERMATTER_DELAMINATING 6 // Pretty obvious. diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 6ef43cf353..82cfd57bac 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -33,7 +33,7 @@ var/yes_code = FALSE var/safety = TRUE var/obj/item/weapon/disk/nuclear/auth = null - use_power = 0 + use_power = NO_POWER_USE var/previous_level = "" var/obj/item/nuke_core/core = null var/deconstruction_state = NUKESTATE_INTACT diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index ed5f2098a7..ef91d7663d 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -7,7 +7,7 @@ level = 1 // underfloor layer = LOW_OBJ_LAYER anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 0 var/obj/item/device/radio/beacon/Beacon diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5e6201cc04..3a1f4d3e9c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -18,7 +18,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 48203bf630..a7446d654a 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -12,7 +12,7 @@ var/initialized_button = 0 armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 90, acid = 70) anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index d5ad78fc1f..c5c3adca70 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -7,7 +7,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 8d17831a3b..190aa8717a 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 diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 2033edd7f7..10142c5370 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 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 300 active_power_usage = 300 obj_integrity = 200 diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index e3b47873e6..08f50e9611 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_screen = "crew" icon_keyboard = "med_key" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 250 active_power_usage = 500 circuit = /obj/item/weapon/circuitboard/computer/crew diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index a92e1cc406..dac2327cb3 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -34,7 +34,7 @@ var/obj/item/weapon/disk/data/diskette = null var/list/delayed_action = null anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 400 diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index e5785e0dab..f07dd35dfc 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -6,7 +6,7 @@ density = 1 var/locked = 0 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 50 active_power_usage = 300 occupant_typecache = list(/mob/living, /obj/item/bodypart/head, /obj/item/organ/brain) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 4053e9755c..e245a03155 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -108,4 +108,4 @@ GLOBAL_LIST_EMPTY(doppler_arrays) name = "integrated tachyon-doppler module" integrated = 1 max_dist = 21 //Should detect most explosions in hearing range. - use_power = 0 + use_power = NO_POWER_USE diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 562e2c5b38..047fc387bd 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -7,7 +7,7 @@ /obj/machinery/doorButtons power_channel = ENVIRON anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 55d8b67582..72757423ad 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -19,7 +19,7 @@ max_integrity = 250 integrity_failure = 100 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100, fire = 90, acid = 30) - 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/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 61d1588372..7dbb5f0edd 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -6,7 +6,7 @@ req_access = list(GLOB.access_security) //reqaccess to access all stored items density = 0 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 100 active_power_usage = 2500 var/list/stored_items = list() diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 5979abdc29..7577306596 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -14,7 +14,7 @@ The console is located at computer/gulag_teleporter.dm state_open = 0 density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 200 active_power_usage = 5000 var/locked = FALSE diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index d0303d47f6..161e6161c8 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -35,7 +35,7 @@ Possible to do for anyone motivated enough: layer = LOW_OBJ_LAYER flags = HEAR anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 obj_integrity = 300 @@ -327,7 +327,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/holopad/proc/SetLightsAndPower() var/total_users = masters.len + LAZYLEN(holo_calls) - use_power = HOLOPAD_PASSIVE_POWER_USAGE + HOLOGRAM_POWER_USAGE * total_users + use_power = total_users > 0 ? ACTIVE_POWER_USE : IDLE_POWER_USE + active_power_usage = HOLOPAD_PASSIVE_POWER_USAGE + (HOLOGRAM_POWER_USAGE * total_users) if(total_users) set_light(2) icon_state = "holopad1" diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 6783d47f87..01c953a2ed 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -6,7 +6,7 @@ var/id = null var/on = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 obj_integrity = 300 diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index bdca0cd16c..b832b322a2 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -14,7 +14,7 @@ var/operating = 0 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE var/disabled = 0 idle_power_usage = 10 active_power_usage = 100 diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index e0355ca2be..7746bde50c 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -8,9 +8,9 @@ Class Variables: use_power (num) current state of auto power use. Possible Values: - 0 -- no auto power use - 1 -- machine is using power at its idle power level - 2 -- machine is using power at its active power level + NO_POWER_USE -- no auto power use + IDLE_POWER_USE -- machine is using power at its idle power level + ACTIVE_POWER_USE -- machine is using power at its active power level active_power_usage (num) Value for the amount of power to use when in active power mode @@ -104,7 +104,7 @@ Class Procs: 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 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 26e62c365e..06d6fcb5c5 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -13,7 +13,7 @@ level = 1 // underfloor layer = LOW_OBJ_LAYER anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 50 var/freq = 1449 // radio frequency @@ -161,10 +161,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: @@ -210,7 +210,7 @@ icon_state = "airlock_control_standby" density = 0 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 45 var/frequency = 1449 var/code = 0 diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 86bef3cf3f..8ae07a1808 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "mass_driver" anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 50 var/power = 1 diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 53489dcd79..02ab70e906 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -12,7 +12,7 @@ layer = OBJ_LAYER invisibility = INVISIBILITY_OBSERVER //the turret is invisible if it's inside its cover density = 1 - 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 req_access = list(GLOB.access_security) @@ -551,7 +551,7 @@ /obj/machinery/porta_turret/syndicate installation = null always_up = 1 - use_power = 0 + use_power = NO_POWER_USE has_cover = 0 scan_range = 9 req_access = list(GLOB.access_syndicate) @@ -620,7 +620,7 @@ obj_integrity = 260 max_integrity = 260 always_up = 1 - use_power = 0 + use_power = NO_POWER_USE has_cover = 0 scan_range = 9 stun_projectile = /obj/item/projectile/beam/laser diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 8390888e5b..cd2e42773a 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 unique_rename = 1 diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index ff1887f699..e344ba4dd3 100755 --- 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 @@ -60,7 +60,7 @@ return 1 G.loc = src charging = G - use_power = 2 + use_power = ACTIVE_POWER_USE update_icon(scan = TRUE) else to_chat(user, "[src] isn't connected to anything!") @@ -88,7 +88,7 @@ charging.loc = loc user.put_in_hands(charging) charging = null - use_power = 1 + use_power = IDLE_POWER_USE update_icon() /obj/machinery/recharger/attack_paw(mob/user) @@ -99,7 +99,7 @@ charging.update_icon() charging.loc = 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 4d8af0543a..8b234b2e8c 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -4,7 +4,7 @@ icon_state = "borgcharger0" density = 0 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 1000 req_access = list(GLOB.access_robotics) @@ -95,14 +95,14 @@ /obj/machinery/recharge_station/open_machine() ..() - use_power = 1 + use_power = IDLE_POWER_USE /obj/machinery/recharge_station/close_machine() if(!panel_open) for(var/mob/living/silicon/robot/R in loc) R.forceMove(src) occupant = R - use_power = 2 + use_power = ACTIVE_POWER_USE add_fingerprint(R) break state_open = 0 diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index d30c3e03be..11544d1741 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -7,7 +7,7 @@ var/metal_amount = 0 var/operating = 0 var/obj/item/being_built = null - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 active_power_usage = 5000 @@ -128,7 +128,7 @@ Please wait until completion...
if (!isnull(building)) if (src.metal_amount >= build_cost) src.operating = 1 - src.use_power = 2 + src.use_power = ACTIVE_POWER_USE src.metal_amount = max(0, src.metal_amount - build_cost) @@ -141,7 +141,7 @@ Please wait until completion...
if (!isnull(src.being_built)) src.being_built.loc = get_turf(src) src.being_built = null - src.use_power = 1 + src.use_power = IDLE_POWER_USE src.operating = 0 cut_overlay("fab-active") return diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index c54b6fab77..0683a6b3b5 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -222,7 +222,7 @@ density = 1 req_access = list(GLOB.access_teleporter) flags = CONDUCT - use_power = 0 + use_power = NO_POWER_USE obj_integrity = 300 max_integrity = 300 var/active = FALSE diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 66c85a1784..7b6abe4483 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -19,7 +19,7 @@ icon_state = "slots1" anchored = 1 density = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 50 circuit = /obj/item/weapon/circuitboard/computer/slot_machine var/money = 3000 //How much money it has CONSUMED diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 2ff95b0d0e..e7683c0841 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -17,7 +17,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 = Emergency Shuttle timer diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index 5589a1be24..a4ccd07ece 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -9,7 +9,7 @@ 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 diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index dd83638c57..acb6d900b5 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -14,7 +14,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages 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 /*heatgen = 0 diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 81392f956e..4b7e1aec26 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -14,7 +14,7 @@ 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 //heatgen = 20 diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 5515ca2cc0..7674694ced 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -15,7 +15,7 @@ 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 //heatgen = 40 diff --git a/code/game/machinery/telecomms/machines/processor.dm b/code/game/machinery/telecomms/machines/processor.dm index 6999e89cbd..5d189b262a 100644 --- a/code/game/machinery/telecomms/machines/processor.dm +++ b/code/game/machinery/telecomms/machines/processor.dm @@ -13,7 +13,7 @@ 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 //heatgen = 100 diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm index 1b872b5d15..965445bb43 100644 --- a/code/game/machinery/telecomms/machines/receiver.dm +++ b/code/game/machinery/telecomms/machines/receiver.dm @@ -13,7 +13,7 @@ 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 //heatgen = 0 diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index 54e07cfbbb..ec4e65d0dc 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -12,7 +12,7 @@ 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 //heatgen = 0 diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 519e5771c1..14f1634b98 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -13,7 +13,7 @@ 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 //heatgen = 50 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 396214d224..74ddfe6f02 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -227,7 +227,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 @@ -338,7 +338,7 @@ desc = "The power control station for a bluespace teleporter. Used for toggling power, and can activate a test-fire to prevent malfunctions." 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/wishgranter.dm b/code/game/machinery/wishgranter.dm index 1866295a8f..3c415dce90 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" - use_power = 0 + use_power = NO_POWER_USE anchored = 1 density = 1 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index ec673b3e86..2d3002e0cf 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 = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 active_power_usage = 5000 req_access = list(GLOB.access_robotics) @@ -156,10 +156,10 @@ materials.use_amount(res_coef) add_overlay("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 cut_overlay("fab-active") desc = initial(desc) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 90c26657f5..c4c1256eac 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -196,7 +196,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~ diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index a8a998e349..6ffcaa4934 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -50,7 +50,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/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm index e2850984bd..f3669f3f51 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/components/binary_devices.dmi' dir = SOUTH initialize_directions = SOUTH|NORTH - use_power = 1 + use_power = IDLE_POWER_USE device_type = BINARY layer = GAS_PUMP_LAYER diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm index 12f22c47bc..87aac56963 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/components/trinary_devices.dmi' dir = SOUTH initialize_directions = SOUTH|NORTH|WEST - use_power = 1 + use_power = IDLE_POWER_USE device_type = TRINARY layer = GAS_FILTER_LAYER diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 326e4794b6..dd3be2e59f 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -2,7 +2,7 @@ name = "air injector" desc = "Has a valve and pump attached to it" icon_state = "inje_map" - use_power = 1 + use_power = IDLE_POWER_USE can_unwrench = TRUE resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF //really helpful in building gas chambers for xenomorphs diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm index 8dee9dc8e7..7dd6d62314 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm @@ -5,7 +5,7 @@ icon_state = "connector_map" //Only for mapping purposes, so mappers can see direction can_unwrench = 1 var/obj/machinery/portable_atmospherics/connected_device - use_power = 0 + use_power = NO_POWER_USE level = 0 layer = GAS_FILTER_LAYER diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 1ff374a9bb..205b7158a7 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -175,7 +175,7 @@ switch(action) if("power") on = !on - use_power = 1 + on + use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE if("target") diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 04beaf28d2..69c547c326 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -9,7 +9,7 @@ name = "air vent" desc = "Has a valve and pump attached to it." icon_state = "vent_map" - use_power = 1 + use_power = IDLE_POWER_USE can_unwrench = 1 welded = 0 level = 1 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 906e586bdd..75782ff958 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -5,7 +5,7 @@ name = "air scrubber" desc = "Has a valve and pump attached to it." icon_state = "scrub_map" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 60 can_unwrench = 1 diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index a403210242..e88b4d266b 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -8,7 +8,7 @@ power_channel = ENVIRON var/frequency = 0 var/id_tag - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 obj_integrity = 150 diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index d0941a516e..6e5bf1904f 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -4,7 +4,7 @@ level = 1 - use_power = 0 + use_power = NO_POWER_USE can_unwrench = 1 var/datum/pipeline/parent = null diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 3a2894653c..e814660bbd 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -1,7 +1,7 @@ /obj/machinery/portable_atmospherics name = "portable_atmospherics" icon = 'icons/obj/atmos.dmi' - use_power = 0 + use_power = NO_POWER_USE obj_integrity = 250 max_integrity = 250 armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 60, acid = 30) diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 77325119a3..55b3eb2568 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -117,7 +117,7 @@ if((!anchored && !movable) || !is_operational()) on = FALSE update_icon() - use_power = 1 + on + use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE if(!on) return diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index a1cba47271..68fc23fd1f 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -89,7 +89,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) /obj/machinery/gateway/centerstation density = TRUE icon_state = "offcenter" - use_power = TRUE + use_power = IDLE_POWER_USE //warping vars var/wait = 0 //this just grabs world.time at world start @@ -176,7 +176,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) /obj/machinery/gateway/centeraway density = TRUE icon_state = "offcenter" - use_power = FALSE + use_power = NO_POWER_USE var/obj/machinery/gateway/centeraway/stationgate = null can_link = TRUE diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm index aa7ccf03b5..d0f27dcf4f 100644 --- a/code/modules/awaymissions/mission_code/challenge.dm +++ b/code/modules/awaymissions/mission_code/challenge.dm @@ -8,7 +8,7 @@ density = 1 resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 0 active_power_usage = 0 diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 395344ce4c..83d83f470c 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -16,7 +16,7 @@ anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE var/chargesa = 1 var/insistinga = 0 diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 20de61d33d..2023dcb99d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -13,7 +13,7 @@ insert ascii eagle on american flag background here icon_state = "fryer_off" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 container_type = OPENCONTAINER var/obj/item/frying = null //What's being fried RIGHT NOW? diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm index dd99b093b4..b2babc19d7 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm @@ -9,7 +9,7 @@ icon_state = "foodcart" density = 1 anchored = 0 - use_power = 0 + use_power = NO_POWER_USE var/food_stored = 0 var/glasses = 0 var/portion = 10 diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index f4ffb4123a..5bc3d6ebe7 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -11,7 +11,7 @@ var/gibtime = 40 // Time from starting until meat appears var/meat_produced = 0 var/ignore_clothing = 0 - 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 e6807f79cb..8d5ffda503 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -12,7 +12,7 @@ icon_state = "icecream_vat" density = 1 anchored = 0 - use_power = 0 + use_power = NO_POWER_USE layer = BELOW_OBJ_LAYER var/list/product_types = list() var/dispense_flavour = ICECREAM_VANILLA diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm index 5770adc539..7fdb07dd26 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm @@ -7,7 +7,7 @@ layer = BELOW_OBJ_LAYER 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/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 168dc120e0..3e7301aed4 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -6,7 +6,7 @@ layer = BELOW_OBJ_LAYER density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 var/operating = 0 // Is it on? diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index ac99e25aed..72d1580bf6 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 = BELOW_OBJ_LAYER density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 50 var/grinded = 0 diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 14486a867e..c672f7fd99 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 @@ anchored = 1 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 705c532260..d66de8e1c5 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -9,7 +9,7 @@ layer = BELOW_OBJ_LAYER 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 @@ -248,7 +248,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" @@ -326,10 +326,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() diff --git a/code/modules/holodeck/computer_funcs.dm b/code/modules/holodeck/computer_funcs.dm index 96df1be42c..cb378f0952 100644 --- a/code/modules/holodeck/computer_funcs.dm +++ b/code/modules/holodeck/computer_funcs.dm @@ -57,7 +57,7 @@ last_change = world.time active = (A != offline_program) - use_power = active+1 + use_power = active ? ACTIVE_POWER_USE : IDLE_POWER_USE for(var/obj/effect/holodeck_effect/HE in effects) HE.deactivate(src) @@ -108,4 +108,4 @@ if(!silent) visible_message("The [obj.name] fades away!") - qdel(obj) \ No newline at end of file + qdel(obj) diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 6949ed6541..bbd05444f4 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -148,7 +148,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/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index c365514358..209372141f 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/weapon/reagent_containers/glass/beaker = null diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 8f49846f60..2eabce113f 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -928,7 +928,7 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "soil" density = 0 - use_power = 0 + use_power = NO_POWER_USE unwrenchable = 0 /obj/machinery/hydroponics/soil/update_icon_hoses() diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 84fe6d6899..3c929d5187 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -793,7 +793,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/Initialize() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index f3e85b2363..309d368d5f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -278,7 +278,7 @@ Difficulty: Very Hard max_n_of_items = INFINITY resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_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/weapon/spellbook)) @@ -380,7 +380,7 @@ Difficulty: Very Hard icon_state = "anomaly_crystal" light_range = 8 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - use_power = 0 + use_power = NO_POWER_USE density = 1 flags = HEAR var/activation_method diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index 9a864331ed..52bcb76c19 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/machines/telecomms.dmi' @@ -38,9 +38,9 @@ /obj/machinery/ntnet_relay/process() if(is_operational()) - 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 c8c303e453..c0f0a05a3e 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -4,7 +4,7 @@ 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/photocopier.dm b/code/modules/paperwork/photocopier.dm index 6610c09968..fedf2cf9e6 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -14,7 +14,7 @@ icon_state = "photocopier" 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/antimatter/control.dm b/code/modules/power/antimatter/control.dm index a1e448d282..92b3abfd2d 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -5,7 +5,7 @@ icon_state = "control" anchored = 0 density = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 100 active_power_usage = 1000 @@ -142,10 +142,10 @@ if(active) toggle_power(1) else - use_power = 0 + use_power = NO_POWER_USE else if(!stat && anchored) - use_power = 1 + use_power = IDLE_POWER_USE return @@ -243,7 +243,7 @@ /obj/machinery/power/am_control_unit/proc/toggle_power(powerfail = 0) active = !active if(active) - use_power = 2 + use_power = ACTIVE_POWER_USE visible_message("The [src.name] starts up.") else use_power = !powerfail diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 1a58538c8e..fc36535e5e 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -16,7 +16,7 @@ anchored = 1 density = 1 dir = NORTH - use_power = 0//Living things generally dont use power + use_power = NO_POWER_USE//Living things generally dont use power idle_power_usage = 0 active_power_usage = 0 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 1ce26fb373..4a26b65b27 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -44,7 +44,7 @@ icon_state = "apc0" anchored = 1 - use_power = 0 + use_power = NO_POWER_USE req_access = null obj_integrity = 200 max_integrity = 200 diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 9fe043a4a0..864b3a2b97 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -13,7 +13,7 @@ icon_state = "teg" anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE var/obj/machinery/atmospherics/components/binary/circulator/cold_circ var/obj/machinery/atmospherics/components/binary/circulator/hot_circ diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 8f37974b2d..0242259873 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -24,7 +24,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne icon = 'icons/obj/machines/gravity_generator.dmi' anchored = 1 density = 1 - use_power = 0 + use_power = NO_POWER_USE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/sprite_number = 0 @@ -107,7 +107,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne // Generator an admin can spawn // /obj/machinery/gravity_generator/main/station/admin - use_power = 0 + use_power = NO_POWER_USE // // Main Generator with the main code @@ -119,7 +119,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne 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 @@ -300,7 +300,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/proc/set_state(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/A = get_area(src) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 133fad1b4d..d2b3efb6da 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -158,7 +158,7 @@ layer = WALL_OBJ_LAYER obj_integrity = 100 max_integrity = 100 - 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 @@ -256,10 +256,10 @@ if(trigger) burn_out() else - use_power = 2 + use_power = ACTIVE_POWER_USE set_light(brightness) else - use_power = 1 + use_power = IDLE_POWER_USE set_light(0) active_power_usage = (brightness * 10) diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm index 88db15cf31..41b2760811 100644 --- a/code/modules/power/monitor.dm +++ b/code/modules/power/monitor.dm @@ -4,7 +4,7 @@ icon_screen = "power" icon_keyboard = "power_key" light_color = LIGHT_COLOR_YELLOW - use_power = 2 + use_power = ACTIVE_POWER_USE idle_power_usage = 20 active_power_usage = 100 circuit = /obj/item/weapon/circuitboard/computer/powermonitor @@ -24,10 +24,10 @@ /obj/machinery/computer/monitor/process() if(!attached) - use_power = 1 + use_power = IDLE_POWER_USE search() else - use_power = 2 + use_power = ACTIVE_POWER_USE record() /obj/machinery/computer/monitor/proc/search() diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index f1f251338e..411a1e589d 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -7,7 +7,7 @@ icon_state = "portgen0" 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 c27566e5bc..b833308cd4 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -12,7 +12,7 @@ anchored = 1 on_blueprints = TRUE var/datum/powernet/powernet = null - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 0 active_power_usage = 0 diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index 53bcc0869b..72e5fb2747 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -8,7 +8,7 @@ icon_state = "rtg" density = 1 anchored = 1 - use_power = 0 + use_power = NO_POWER_USE // You can buckle someone to RTG, then open its panel. Fun stuff. can_buckle = TRUE diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index ac4873a09b..74191fcfdb 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(rad_collectors) anchored = 0 density = 1 req_access = list(GLOB.access_engine_equip) -// use_power = 0 +// use_power = NO_POWER_USE obj_integrity = 350 max_integrity = 350 integrity_failure = 80 diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index c3bf399ed1..93f118979b 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -8,7 +8,7 @@ anchored = 1 density = 0 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - use_power = 0 + use_power = NO_POWER_USE luminosity = 4 layer = ABOVE_OBJ_LAYER var/obj/machinery/field/generator/FG1 = null diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index c200f75488..f10ed9cb75 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -13,7 +13,7 @@ var/charge = 0 var/atom/target = null - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 10 active_power_usage = 300 @@ -153,7 +153,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 06c2544daf..71aff2e7be 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -25,7 +25,7 @@ field_generator power level display icon_state = "Field_Gen" anchored = 0 density = 1 - use_power = 0 + use_power = NO_POWER_USE obj_integrity = 500 max_integrity = 500 //100% immune to lasers and energy projectiles since it absorbs their energy. diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index e07f97c6ca..7eaca47f54 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 resistance_flags = FIRE_PROOF // You can buckle someone to the singularity generator, then start the engine. Fun! diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index fd3052cde4..4a94378559 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -5,7 +5,7 @@ icon_state = "control_box" anchored = 0 density = 1 - use_power = 0 + use_power = NO_POWER_USE idle_power_usage = 500 active_power_usage = 10000 dir = NORTH @@ -43,7 +43,7 @@ /obj/machinery/particle_accelerator/control_box/proc/update_state() if(construction_state < PA_CONSTRUCTION_COMPLETE) - use_power = 0 + use_power = NO_POWER_USE assembled = 0 active = 0 for(var/CP in connected_parts) @@ -54,7 +54,7 @@ connected_parts.Cut() return if(!part_scan()) - use_power = 1 + use_power = IDLE_POWER_USE active = 0 connected_parts.Cut() @@ -136,9 +136,9 @@ ..() if(stat & NOPOWER) active = 0 - use_power = 0 + use_power = NO_POWER_USE else if(!stat && construction_state == PA_CONSTRUCTION_COMPLETE) - use_power = 1 + use_power = IDLE_POWER_USE /obj/machinery/particle_accelerator/control_box/process() if(active) @@ -208,14 +208,14 @@ message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](?) (FLW) in ([x],[y],[z] - JMP)",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])") if(active) - use_power = 2 + use_power = ACTIVE_POWER_USE for(var/CP in connected_parts) var/obj/structure/particle_accelerator/part = CP part.strength = strength part.powered = 1 part.update_icon() else - use_power = 1 + use_power = IDLE_POWER_USE for(var/CP in connected_parts) var/obj/structure/particle_accelerator/part = CP part.strength = null diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index ba025b7529..9e946a0b80 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -20,7 +20,7 @@ icon_state = "smes" density = 1 anchored = 1 - use_power = 0 + use_power = NO_POWER_USE var/capacity = 5e6 // maximum charge var/charge = 0 // actual charge diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 47e04339d4..5b2026cfaa 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 @@ -263,7 +263,7 @@ icon_state = "computer" anchored = 1 density = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 250 obj_integrity = 200 max_integrity = 200 diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 8a888d5aff..4565ce72b0 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 obj_integrity = 250 max_integrity = 250 integrity_failure = 50 diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 1f5085ae09..9019bceec4 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -5,7 +5,7 @@ anchored = 1 icon = 'icons/obj/chemical.dmi' icon_state = "dispenser" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 40 interact_offline = 1 resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index da728fea89..d4270f6f6b 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 resistance_flags = FIRE_PROOF | ACID_PROOF var/obj/item/weapon/reagent_containers/beaker = null diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 93628a9cc1..c8c074b938 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -5,7 +5,7 @@ anchored = 1 icon = 'icons/obj/chemical.dmi' icon_state = "mixer0" - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 20 resistance_flags = FIRE_PROOF | ACID_PROOF var/obj/item/weapon/reagent_containers/beaker = null diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index c082831f2b..3cc5eb3d33 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -5,7 +5,7 @@ icon_state = "juicer1" layer = BELOW_OBJ_LAYER anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 pass_flags = PASSTABLE diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index fa58de0964..872b7d270d 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 46bfab3788..e5ab385352 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(message_servers, list()) name = "Messaging Server" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 @@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(message_servers, list()) name = "Blackbox Recorder" density = 1 anchored = 1 - use_power = 1 + use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index ea7f5e727b..5ae2485608 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -8,7 +8,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 diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 93aefb4a53..9b4840588b 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -6,7 +6,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) icon = 'icons/obj/monitors.dmi' icon_state = "auth_off" 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 52919c996d..a1ff2aa743 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -240,7 +240,7 @@ var/obj/machinery/bsa/full/cannon var/notice var/target - use_power = 0 + use_power = NO_POWER_USE circuit = /obj/item/weapon/circuitboard/computer/bsa_control icon = 'icons/obj/machines/particle_accelerator.dmi' icon_state = "control_boxp"