use_power var now uses a define to reflect it not being a bool (#1842)

This commit is contained in:
CitadelStationBot
2017-06-30 22:41:59 -05:00
committed by kevinz000
parent c32da6e2cb
commit 9d5e51777b
103 changed files with 155 additions and 149 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
@@ -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
@@ -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
@@ -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
@@ -4,7 +4,7 @@
level = 1
use_power = 0
use_power = NO_POWER_USE
can_unwrench = 1
var/datum/pipeline/parent = null
@@ -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)
@@ -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
+2 -2
View File
@@ -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
@@ -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
@@ -16,7 +16,7 @@
anchored = 1
density = 1
use_power = 0
use_power = NO_POWER_USE
var/chargesa = 1
var/insistinga = 0
@@ -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?
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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?
@@ -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
@@ -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
@@ -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()
+2 -2
View File
@@ -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)
qdel(obj)
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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()
@@ -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()
@@ -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
@@ -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()
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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)
+3 -3
View File
@@ -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)
+3 -3
View File
@@ -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()
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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
+2 -2
View File
@@ -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
@@ -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.
+1 -1
View File
@@ -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!
@@ -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"](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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
@@ -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
+1 -1
View File
@@ -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"