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

2017-06-30 20:41:59 -07:00
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