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

2017-06-30 22:41:59 -05:00
parent c32da6e2cb
commit 9d5e51777b
103 changed files with 155 additions and 149 deletions
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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)
@@ -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)
@@ -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()
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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.
@@ -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
@@ -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

@@ -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
@@ -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