In fact lets use the constants instead of bare numbers for use_power everywhere.

This commit is contained in:
Leshana
2020-03-21 19:41:01 -04:00
parent c2d16acdca
commit 938384cb1b
140 changed files with 175 additions and 175 deletions
+2 -2
View File
@@ -26,7 +26,7 @@
/obj/machinery/gateway/centerstation
density = 1
icon_state = "offcenter"
use_power = 1
use_power = USE_POWER_IDLE
//warping vars
var/list/linked = list()
@@ -142,7 +142,7 @@ obj/machinery/gateway/centerstation/process()
/obj/machinery/gateway/centeraway
density = 1
icon_state = "offcenter"
use_power = 0
use_power = USE_POWER_OFF
var/calibrated = 1
var/list/linked = list() //a list of the connected gateway chunks
var/ready = 0
+1 -1
View File
@@ -20,7 +20,7 @@ log transactions
icon = 'icons/obj/terminals.dmi'
icon_state = "atm"
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 10
circuit = /obj/item/weapon/circuitboard/atm
var/datum/money_account/authenticated_account
@@ -10,7 +10,7 @@
icon = 'icons/obj/cooking_machines.dmi'
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 5
var/on_icon // Icon state used when cooking.
+1 -1
View File
@@ -14,7 +14,7 @@
var/gib_time = 40 // Time from starting until meat appears
var/gib_throw_dir = WEST // Direction to spit meat and gibs in.
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 2
active_power_usage = 500
+1 -1
View File
@@ -14,7 +14,7 @@
icon_state = "icecream_vat"
density = 1
anchored = 0
use_power = 0
use_power = USE_POWER_OFF
flags = OPENCONTAINER | NOREACT
var/list/product_types = list()
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "mw"
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 5
active_power_usage = 100
clicksound = "button"
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "smartfridge"
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 5
active_power_usage = 100
flags = NOREACT
+4 -4
View File
@@ -4,7 +4,7 @@
icon_keyboard = "tech_key"
icon_screen = "holocontrol"
use_power = 1
use_power = USE_POWER_IDLE
active_power_usage = 8000 //8kW for the scenery + 500W per holoitem
var/item_power_usage = 500
@@ -301,7 +301,7 @@
last_change = world.time
active = 1
use_power = 2
use_power = USE_POWER_ACTIVE
for(var/item in holographic_objs)
derez(item)
@@ -362,7 +362,7 @@
last_gravity_change = world.time
active = 1
use_power = 1
use_power = USE_POWER_IDLE
if(A.has_gravity)
A.gravitychange(0)
@@ -377,4 +377,4 @@
linkedholodeck.gravitychange(1)
active = 0
use_power = 1
use_power = USE_POWER_IDLE
+1 -1
View File
@@ -391,7 +391,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u
var/eventstarted = 0
anchored = 1.0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 2
active_power_usage = 6
power_channel = ENVIRON
+1 -1
View File
@@ -8,7 +8,7 @@
icon_state = "station_map"
anchored = 1
density = 0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 500
circuit = /obj/item/weapon/circuitboard/station_map
+1 -1
View File
@@ -37,7 +37,7 @@
icon_state = "hydrotray3"
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
var/obj/item/seeds/seed // Currently loaded seed packet.
var/obj/item/weapon/disk/botany/loaded_disk //Currently loaded data disk.
+1 -1
View File
@@ -24,7 +24,7 @@
icon_state = "seeds"
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 100
var/seeds_initialized = 0 // Map-placed ones break if seeds are loaded right at the start of the round, so we do it on the first interaction
+1 -1
View File
@@ -2,7 +2,7 @@
name = "soil"
icon_state = "soil"
density = 0
use_power = 0
use_power = USE_POWER_OFF
mechanical = 0
tray_light = 0
frozen = -1
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/machinery/mining
icon = 'icons/obj/mining_drill.dmi'
anchored = 0
use_power = 0 //The drill takes power directly from a cell.
use_power = USE_POWER_OFF //The drill takes power directly from a cell.
density = 1
layer = MOB_LAYER+0.1 //So it draws over mobs in the tile north of it.
+1 -1
View File
@@ -291,7 +291,7 @@ var/list/ai_verbs_default = list(
/obj/machinery/ai_powersupply
name="Power Supply"
active_power_usage=50000 // Station AIs use significant amounts of power. This, when combined with charged SMES should mean AI lasts for 1hr without external power.
use_power = 2
use_power = USE_POWER_ACTIVE
power_channel = EQUIP
var/mob/living/silicon/ai/powered_ai = null
invisibility = 100
@@ -11,7 +11,7 @@
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 20
active_power_usage = 5000
@@ -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 = USE_POWER_ACTIVE
active_power_usage = 20000 //20kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational.
idle_power_usage = 100
icon_state = "bus"
+1 -1
View File
@@ -12,7 +12,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
insert_anim = "faxsend"
req_one_access = list(access_lawyer, access_heads, access_armory, access_qm)
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 30
active_power_usage = 200
circuit = /obj/item/weapon/circuitboard/fax
+1 -1
View File
@@ -9,7 +9,7 @@
var/shred_anim = "shredder-shredding"
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 200
power_channel = EQUIP
+1 -1
View File
@@ -6,7 +6,7 @@
var/insert_anim = "bigscanner1"
anchored = 1
density = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 30
active_power_usage = 200
power_channel = EQUIP
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "control"
anchored = 1
density = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 100
active_power_usage = 1000
+1 -1
View File
@@ -16,7 +16,7 @@ proc/cardinalrange(var/center)
anchored = 1
density = 1
dir = 1
use_power = 0//Living things generally dont use power
use_power = USE_POWER_OFF //Living things generally dont use power
idle_power_usage = 0
active_power_usage = 0
+1 -1
View File
@@ -67,7 +67,7 @@
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
use_power = 0
use_power = USE_POWER_OFF
clicksound = "switch"
req_access = list(access_engine_equip)
var/area/area
+1 -1
View File
@@ -13,7 +13,7 @@ var/list/fusion_cores = list()
icon = 'icons/obj/machines/power/fusion.dmi'
icon_state = "core0"
density = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 50
active_power_usage = 500 //multiplied by field strength
anchored = 0
@@ -7,7 +7,7 @@ var/list/fuel_injectors = list()
density = 1
anchored = 0
req_access = list(access_engine)
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 500
@@ -6,7 +6,7 @@ var/list/gyrotrons = list()
desc = "It is a heavy duty industrial gyrotron suited for powering fusion reactors."
icon_state = "emitter-off"
req_access = list(access_engine)
use_power = 1
use_power = USE_POWER_IDLE
active_power_usage = 50000
circuit = /obj/item/weapon/circuitboard/gyrotron
+1 -1
View File
@@ -5,7 +5,7 @@
density = 1
anchored = 0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 100 //Watts, I hope. Just enough to do the computer and display things.
var/max_power = 500000
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "teg"
anchored = 1
density = 1
use_power = 0
use_power = USE_POWER_OFF
var/obj/machinery/atmospherics/unary/generator_input/input1
var/obj/machinery/atmospherics/unary/generator_input/input2
+1 -1
View File
@@ -16,7 +16,7 @@
icon_state = "TheSingGen"
anchored = 1
density = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 200
active_power_usage = 1000
var/on = 1
+1 -1
View File
@@ -168,7 +168,7 @@ var/global/list/light_type_cache = list()
anchored = 1
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
use_power = 2
use_power = USE_POWER_ACTIVE
idle_power_usage = 2
active_power_usage = 10 // Previously 20.
power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "portgen0"
density = 1
anchored = 0
use_power = 0
use_power = USE_POWER_OFF
var/active = 0
var/power_gen = 5000
+1 -1
View File
@@ -11,7 +11,7 @@
icon = 'icons/obj/power.dmi'
anchored = 1.0
var/datum/powernet/powernet = null
use_power = 0
use_power = USE_POWER_OFF
idle_power_usage = 0
active_power_usage = 0
@@ -15,7 +15,7 @@
anchored = 1.0
circuit = /obj/item/weapon/circuitboard/powermonitor
var/alerting = 0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 300
active_power_usage = 300
var/datum/nano_module/power_monitor/power_monitor
@@ -8,7 +8,7 @@
anchored = 1
density = 0
unacidable = 1
use_power = 0
use_power = USE_POWER_OFF
light_range = 4
flags = PROXMOVE
var/obj/machinery/field_generator/FG1 = null
+1 -1
View File
@@ -10,7 +10,7 @@
req_access = list(access_engine_equip)
var/id = null
use_power = 0 //uses powernet power, not APC power
use_power = USE_POWER_OFF //uses powernet power, not APC power
active_power_usage = 30000 //30 kW laser. I guess that means 30 kJ per shot.
var/active = 0
@@ -20,7 +20,7 @@ field_generator power level display
icon_state = "Field_Gen"
anchored = 0
density = 1
use_power = 0
use_power = USE_POWER_OFF
var/const/num_power_levels = 6 // Total number of power level icon has
var/Varedit_start = 0
var/Varpower = 0
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "TheSingGen"
anchored = 0
density = 1
use_power = 0
use_power = USE_POWER_OFF
var/energy = 0
var/creation_type = /obj/singularity
@@ -258,7 +258,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 = USE_POWER_OFF
idle_power_usage = 0
active_power_usage = 0
var/construction_state = 0
@@ -8,7 +8,7 @@
reference = "control_box"
anchored = 0
density = 1
use_power = 0
use_power = USE_POWER_OFF
idle_power_usage = 500
active_power_usage = 70000 //70 kW per unit of strength
construction_state = 0
@@ -9,7 +9,7 @@
icon_state = "smasher"
anchored = 0
density = 1
use_power = 0
use_power = USE_POWER_OFF
var/successful_craft = FALSE // Are we waiting to be emptied?
var/image/material_layer // Holds the image used for the filled overlay.
+1 -1
View File
@@ -11,7 +11,7 @@
icon_state = "smes"
density = 1
anchored = 1
use_power = 0
use_power = USE_POWER_OFF
circuit = /obj/item/weapon/circuitboard/smes
clicksound = "switch"
+2 -2
View File
@@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(solars_list)
icon_state = "sp_base"
anchored = 1
density = 1
use_power = 0
use_power = USE_POWER_OFF
idle_power_usage = 0
active_power_usage = 0
var/id = 0
@@ -285,7 +285,7 @@ GLOBAL_LIST_EMPTY(solars_list)
icon_state = "solar"
anchored = 1
density = 1
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 250
var/id = 0
var/cdir = 0
+1 -1
View File
@@ -10,7 +10,7 @@
icon_state = "tracker"
anchored = 1
density = 1
use_power = 0
use_power = USE_POWER_OFF
var/id = 0
var/sun_angle = 0 // sun angle as set by sun datum
+2 -2
View File
@@ -16,7 +16,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
circuit = /obj/item/weapon/circuitboard/chem_master
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 20
var/beaker = null
var/obj/item/weapon/storage/pill_bottle/loaded_pill_bottle = null
@@ -333,7 +333,7 @@
icon_state = "juicer1"
density = 0
anchored = 0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 5
active_power_usage = 100
circuit = /obj/item/weapon/circuitboard/grinder
@@ -15,7 +15,7 @@
var/accept_drinking = 0
var/amount = 30
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 100
anchored = 1
@@ -6,7 +6,7 @@
/obj/machinery/portable_atmospherics/powered/reagent_distillery
name = "chemical distillery"
desc = "A complex machine utilizing state-of-the-art components to mix chemicals at different temperatures."
use_power = 1
use_power = USE_POWER_IDLE
icon = 'icons/obj/machines/reagent.dmi'
icon_state = "distiller"
+1 -1
View File
@@ -20,7 +20,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
hidden_materials = list(MAT_PLASTEEL, MAT_DURASTEEL, MAT_GRAPHITE, MAT_VERDANTIUM, MAT_MORPHIUM, MAT_METALHYDROGEN, MAT_SUPERMATTER)
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 30
active_power_usage = 2500
@@ -12,7 +12,7 @@ Note: Must be placed within 3 tiles of the R&D Console
var/obj/item/weapon/loaded_item = null
var/decon_mod = 0
circuit = /obj/item/weapon/circuitboard/destructive_analyzer
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 30
active_power_usage = 2500
+2 -2
View File
@@ -54,7 +54,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
desc = "Facilitates both PDA messages and request console functions."
density = 1
anchored = 1.0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 100
@@ -240,7 +240,7 @@ var/obj/machinery/blackbox_recorder/blackbox
desc = "Records all radio communications, as well as various other information in case of the worst."
density = 1
anchored = 1.0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 100
var/list/messages = list() //Stores messages of non-standard frequencies
+1 -1
View File
@@ -3,7 +3,7 @@
icon_state = "protolathe"
flags = OPENCONTAINER
circuit = /obj/item/weapon/circuitboard/protolathe
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 30
active_power_usage = 5000
+1 -1
View File
@@ -7,7 +7,7 @@
icon = 'icons/obj/machines/research.dmi'
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
var/busy = 0
var/obj/machinery/computer/rdconsole/linked_console
@@ -16,7 +16,7 @@
//1 = select event
//2 = authenticate
anchored = 1.0
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 2
active_power_usage = 6
power_channel = ENVIRON
+1 -1
View File
@@ -134,7 +134,7 @@
var/is_open = 0 //Whether or not the wires are exposed
var/locked = 0
var/check_delay = 60 //periodically recheck if we need to rebuild a shield
use_power = 0
use_power = USE_POWER_OFF
idle_power_usage = 0
var/global/list/blockedturfs = list(
/turf/space,
+1 -1
View File
@@ -23,7 +23,7 @@
//There have to be at least two posts, so these are effectively doubled
var/power_draw = 30000 //30 kW. How much power is drawn from powernet. Increase this to allow the generator to sustain longer shields, at the cost of more power draw.
var/max_stored_power = 50000 //50 kW
use_power = 0 //Draws directly from power net. Does not use APC power.
use_power = USE_POWER_OFF //Draws directly from power net. Does not use APC power.
/obj/machinery/shieldwallgen/attack_hand(mob/user as mob)
if(state != 1)
+1 -1
View File
@@ -15,7 +15,7 @@
var/max_charge = 8e6 //8 MJ
var/max_charge_rate = 400000 //400 kW
var/locked = 0
use_power = 0 //doesn't use APC power
use_power = USE_POWER_OFF //doesn't use APC power
var/charge_rate = 100000 //100 kW
var/obj/machinery/shield_gen/owned_gen
+1 -1
View File
@@ -4,7 +4,7 @@
description_info = "This device disrupts shields on directly adjacent tiles (in a + shaped pattern). They are commonly installed around exterior airlocks to prevent shields from blocking EVA access."
icon = 'icons/obj/machines/shielding.dmi'
icon_state = "fdiffuser_on"
use_power = 2
use_power = USE_POWER_ACTIVE
idle_power_usage = 25 // Previously 100.
active_power_usage = 500 // Previously 2000
anchored = 1
+1 -1
View File
@@ -22,7 +22,7 @@
var/time_since_fail = 100
var/energy_conversion_rate = 0.0006 //how many renwicks per watt? Higher numbers equals more effiency.
var/z_range = 0 // How far 'up and or down' to extend the shield to, in z-levels. Only works on MultiZ supported z-levels.
use_power = 0 //doesn't use APC power
use_power = USE_POWER_OFF //doesn't use APC power
/obj/machinery/shield_gen/advanced
name = "advanced bubble shield generator"
@@ -10,7 +10,7 @@
density = 1
var/previous_power_state = 0
use_power = 1
use_power = USE_POWER_IDLE
active_power_usage = 2000
idle_power_usage = 1000
@@ -7,7 +7,7 @@
idle_power_usage = 100
active_power_usage = 1000
use_power = 1
use_power = USE_POWER_IDLE
var/spawn_progress_time = 0
var/max_spawn_time = 50
@@ -6,7 +6,7 @@
density = 1
idle_power_usage = 50
active_power_usage = 750
use_power = 1
use_power = USE_POWER_IDLE
var/harvesting = 0
var/obj/item/weapon/anobattery/inserted_battery
var/obj/machinery/artifact/cur_artifact
@@ -6,7 +6,7 @@
icon = 'icons/obj/virology.dmi'
icon_state = "analyser"
use_power = 1 //1 = idle, 2 = active
use_power = USE_POWER_IDLE
idle_power_usage = 20
active_power_usage = 300
@@ -42,7 +42,7 @@
/obj/machinery/xenobio
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
var/obj/item/weapon/disk/xenobio/loaded_disk //Currently loaded data disk.
+1 -1
View File
@@ -10,7 +10,7 @@
desc = "Injects biological organisms that are inserted with the contents of an inserted beaker at the command of a remote computer."
density = 1
anchored = 1
use_power = 1
use_power = USE_POWER_IDLE
icon = 'icons/obj/biogenerator.dmi'
icon_state = "biogen-work"
var/mob/living/occupant
@@ -11,7 +11,7 @@
icon_keyboard = "med_key"
icon_screen = "dna"
light_color = "#315ab4"
use_power = 1
use_power = USE_POWER_IDLE
idle_power_usage = 250
active_power_usage = 500
circuit = /obj/item/weapon/circuitboard/xenobio2computer