between() -> clamp() & swaps args 1 and 2 in uses

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -232,23 +232,23 @@
 		pump_direction = 1
 
 	if(signal.data["set_input_pressure"])
-		input_pressure_min = between(
-			0,
+		input_pressure_min = clamp(
 			text2num(signal.data["set_input_pressure"]),
+			0,
 			ONE_ATMOSPHERE*50
 		)
 
 	if(signal.data["set_output_pressure"])
-		output_pressure_max = between(
-			0,
+		output_pressure_max = clamp(
 			text2num(signal.data["set_output_pressure"]),
+			0,
 			ONE_ATMOSPHERE*50
 		)
 
 	if(signal.data["set_external_pressure"])
-		external_pressure_bound = between(
-			0,
+		external_pressure_bound = clamp(
 			text2num(signal.data["set_external_pressure"]),
+			0,
 			ONE_ATMOSPHERE*50
 		)
 

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -181,9 +181,9 @@
 		unlocked = !unlocked
 
 	if("set_target_pressure" in signal.data)
-		target_pressure = between(
-			0,
+		target_pressure = clamp(
 			text2num(signal.data["set_target_pressure"]),
+			0,
 			max_pressure_setting
 		)
 
@@ -262,7 +262,7 @@
 					target_pressure = max_pressure_setting
 				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)
+					src.target_pressure = clamp(new_pressure, 0, max_pressure_setting)
 
 		if("set_flow_rate")
 			. = TRUE
@@ -273,7 +273,7 @@
 					set_flow_rate = air1.volume
 				if("set")
 					var/new_flow_rate = input(usr,"Enter new flow rate limit (0-[air1.volume]L/s)","Flow Rate Control",src.set_flow_rate) as num
-					src.set_flow_rate = between(0, new_flow_rate, air1.volume)
+					src.set_flow_rate = clamp(new_flow_rate, 0, air1.volume)
 
 	update_icon()
 	add_fingerprint(usr)

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -182,9 +182,9 @@ Thus, the two variables affect pump operation are set in New():
 		update_use_power(!use_power)
 
 	if(signal.data["set_output_pressure"])
-		target_pressure = between(
-			0,
+		target_pressure = clamp(
 			text2num(signal.data["set_output_pressure"]),
+			0,
 			ONE_ATMOSPHERE*50
 		)
 
@@ -227,7 +227,7 @@ Thus, the two variables affect pump operation are set in New():
 					target_pressure = max_pressure_setting
 				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)
+					src.target_pressure = clamp(new_pressure, 0, max_pressure_setting)
 			. = TRUE
 
 	add_fingerprint(usr)

code/ATMOSPHERICS/components/omni_devices/mixer.dm

@@ -184,7 +184,7 @@
 			if(!configuring || use_power)
 				return
 			var/new_flow_rate = input(usr,"Enter new flow rate limit (0-[max_flow_rate]L/s)","Flow Rate Control",set_flow_rate) as num
-			set_flow_rate = between(0, new_flow_rate, max_flow_rate)
+			set_flow_rate = clamp(new_flow_rate, 0, max_flow_rate)
 		if("switch_mode")
 			. = TRUE
 			if(!configuring || use_power)
@@ -268,7 +268,7 @@
 	var/new_con = (input(usr,"Enter a new concentration (0-[round(remain_con * 100, 0.5)])%","Concentration control", min(remain_con, old_con)*100) as num) / 100
 
 	//cap it between 0 and the max remaining concentration
-	new_con = between(0, new_con, remain_con)
+	new_con = clamp(new_con, 0, remain_con)
 
 	//new_con = min(remain_con, new_con)
 
@@ -294,4 +294,4 @@
 /obj/machinery/atmospherics/omni/mixer/proc/con_lock(var/port = NORTH)
 	for(var/datum/omni_port/P in inputs)
 		if(P.dir == port)
-			P.con_lock = !P.con_lock
+			P.con_lock = !P.con_lock

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -120,7 +120,7 @@
 			else
 				set_temperature = max(amount, 0)
 		if("setPower") //setting power to 0 is redundant anyways
-			var/new_setting = between(0, text2num(params["value"]), 100)
+			var/new_setting = clamp(text2num(params["value"]), 0, 100)
 			set_power_level(new_setting)
 
 	add_fingerprint(usr)

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -140,7 +140,7 @@
 
 	if(signal.data["set_volume_rate"])
 		var/number = text2num(signal.data["set_volume_rate"])
-		volume_rate = between(0, number, air_contents.volume)
+		volume_rate = clamp(number, 0, air_contents.volume)
 
 	if(signal.data["status"])
 		spawn(2)

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -323,9 +323,9 @@
 		if (signal.data["set_internal_pressure"] == "default")
 			internal_pressure_bound = internal_pressure_bound_default
 		else
-			internal_pressure_bound = between(
-				0,
+			internal_pressure_bound = clamp(
 				text2num(signal.data["set_internal_pressure"]),
+				0,
 				ONE_ATMOSPHERE*50
 			)
 
@@ -333,25 +333,25 @@
 		if (signal.data["set_external_pressure"] == "default")
 			external_pressure_bound = external_pressure_bound_default
 		else
-			external_pressure_bound = between(
-				0,
+			external_pressure_bound = clamp(
 				text2num(signal.data["set_external_pressure"]),
+				0,
 				ONE_ATMOSPHERE*50
 			)
 
 	if(signal.data["adjust_internal_pressure"] != null)
-		internal_pressure_bound = between(
-			0,
+		internal_pressure_bound = clamp(
 			internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),
+			0,
 			ONE_ATMOSPHERE*50
 		)
 
 	if(signal.data["adjust_external_pressure"] != null)
 
 
-		external_pressure_bound = between(
-			0,
+		external_pressure_bound = clamp(
 			external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
+			0,
 			ONE_ATMOSPHERE*50
 		)