Atmos machine update

Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -20,18 +20,16 @@ Thus, the two variables affect pump operation are set in New():
 	name = "gas pump"
 	desc = "A pump"
 
-	var/on = 0
 	var/target_pressure = ONE_ATMOSPHERE
 
 	//var/max_volume_transfer = 10000
 
-	use_power = 1
+	use_power = 0
 	idle_power_usage = 150		//internal circuitry, friction losses and stuff
-	active_power_usage = 7500	//This also doubles as a measure of how powerful the pump is, in Watts. 7500 W ~ 10 HP
+	power_rating = 7500			//7500 W ~ 10 HP
 
-	var/last_power_draw = 0			//for UI
 	var/max_pressure_setting = 15000	//kPa
-	
+
 	var/frequency = 0
 	var/id = null
 	var/datum/radio_frequency/radio_connection
@@ -43,14 +41,14 @@ Thus, the two variables affect pump operation are set in New():
 
 /obj/machinery/atmospherics/binary/pump/on
 	icon_state = "map_on"
-	on = 1
+	use_power = 1
 
 
 /obj/machinery/atmospherics/binary/pump/update_icon()
 	if(!powered())
 		icon_state = "off"
 	else
-		icon_state = "[on ? "on" : "off"]"
+		icon_state = "[use_power ? "on" : "off"]"
 
 /obj/machinery/atmospherics/binary/pump/update_underlays()
 	if(..())
@@ -65,10 +63,10 @@ Thus, the two variables affect pump operation are set in New():
 	update_underlays()
 
 /obj/machinery/atmospherics/binary/pump/process()
-	if((stat & (NOPOWER|BROKEN)) || !on)
-		update_use_power(0)	//usually we get here because a player turned a pump off - definitely want to update.
-		last_power_draw = 0
-		last_flow_rate = 0
+	last_power_draw = 0
+	last_flow_rate = 0
+
+	if((stat & (NOPOWER|BROKEN)) || !use_power)
 		return
 
 	var/power_draw = -1
@@ -76,22 +74,13 @@ Thus, the two variables affect pump operation are set in New():
 
 	if(pressure_delta > 0.01 && air1.temperature > 0)
 		//Figure out how much gas to transfer to meet the target pressure.
-		var/air_temperature = (air2.temperature > 0)? air2.temperature : air1.temperature
-		var/output_volume = air2.volume + (network2? network2.volume : 0)
-		
-		//get the number of moles that would have to be transfered to bring sink to the target pressure
-		var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
-		
-		power_draw = pump_gas(src, air1, air2, transfer_moles, active_power_usage)
-	
-	if (power_draw < 0)
-		//update_use_power(0)
-		use_power = 0	//don't force update - easier on CPU
-		last_power_draw = 0
-		last_flow_rate = 0
-	else
-		last_power_draw = handle_power_draw(power_draw)
-		
+		var/transfer_moles = calculate_transfer_moles(air1, air2, pressure_delta, (network2)? network2.volume : 0)
+		power_draw = pump_gas(src, air1, air2, transfer_moles, power_rating)
+
+	if (power_draw >= 0)
+		last_power_draw = power_draw
+		use_power(power_draw)
+
 		if(network1)
 			network1.update = 1
 
@@ -119,7 +108,7 @@ Thus, the two variables affect pump operation are set in New():
 	signal.data = list(
 		"tag" = id,
 		"device" = "AGP",
-		"power" = on,
+		"power" = use_power,
 		"target_output" = target_pressure,
 		"sigtype" = "status"
 	)
@@ -134,14 +123,14 @@ Thus, the two variables affect pump operation are set in New():
 
 	// this is the data which will be sent to the ui
 	var/data[0]
-	
+
 	data = list(
-		"on" = on,
+		"on" = use_power,
 		"pressure_set" = round(target_pressure*100),	//Nano UI can't handle rounded non-integers, apparently.
 		"max_pressure" = max_pressure_setting,
 		"last_flow_rate" = round(last_flow_rate*10),
 		"last_power_draw" = round(last_power_draw),
-		"max_power_draw" = active_power_usage,
+		"max_power_draw" = power_rating,
 	)
 
 	// update the ui if it exists, returns null if no ui is passed/found
@@ -152,7 +141,7 @@ Thus, the two variables affect pump operation are set in New():
 		ui = new(user, src, ui_key, "gas_pump.tmpl", name, 470, 290)
 		ui.set_initial_data(data)	// when the ui is first opened this is the data it will use
 		ui.open()					// open the new ui window
-		ui.set_auto_update(1)		// auto update every Master Controller tick
+		ui.set_auto_update(1)		// auto update every Master Controller tick
 
 /obj/machinery/atmospherics/binary/pump/initialize()
 	..()
@@ -165,12 +154,12 @@ Thus, the two variables affect pump operation are set in New():
 
 	if(signal.data["power"])
 		if(text2num(signal.data["power"]))
-			on = 1
+			use_power = 1
 		else
-			on = 0
+			use_power = 0
 
 	if("power_toggle" in signal.data)
-		on = !on
+		use_power = !use_power
 
 	if(signal.data["set_output_pressure"])
 		target_pressure = between(
@@ -190,7 +179,7 @@ Thus, the two variables affect pump operation are set in New():
 	return
 
 /obj/machinery/atmospherics/binary/pump/attack_hand(user as mob)
-	if(..())
+	if(..())
 		return
 	src.add_fingerprint(usr)
 	if(!src.allowed(user))
@@ -201,11 +190,11 @@ Thus, the two variables affect pump operation are set in New():
 	return
 
 /obj/machinery/atmospherics/binary/pump/Topic(href,href_list)
-	if(..()) return
-	
+	if(..()) return
+
 	if(href_list["power"])
-		on = !on
-	
+		use_power = !use_power
+
 	switch(href_list["set_press"])
 		if ("min")
 			target_pressure = 0
@@ -214,10 +203,10 @@ Thus, the two variables affect pump operation are set in New():
 		if ("set")
 			var/new_pressure = input(usr,"Enter new output pressure (0-[max_pressure_setting]kPa)","Pressure control",src.target_pressure) as num
 			src.target_pressure = between(0, new_pressure, max_pressure_setting)
-	
+
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
-	
+
 	src.update_icon()
 
 /obj/machinery/atmospherics/binary/pump/power_change()
@@ -229,7 +218,7 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
-	if (!(stat & NOPOWER) && on)
+	if (!(stat & NOPOWER) && use_power)
 		user << "\red You cannot unwrench this [src], turn it off first."
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
@@ -246,4 +235,4 @@ Thus, the two variables affect pump operation are set in New():
 			"\blue You have unfastened \the [src].", \
 			"You hear ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		del(src)