extreme optimization project to maybe fix game

code/modules/atmospherics/environmental/LINDA_turf_tile.dm

@@ -46,12 +46,45 @@
 /////////////////GAS MIXTURE PROCS///////////////////
 
 /turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
+	return assume_air_ratio(giver, 1)
+
+/turf/open/assume_air_moles(datum/gas_mixture/giver, moles)
 	if(!giver)
 		return FALSE
 	if(SSair.thread_running())
-		SSair.deferred_airs += list(list(src, giver))
+		SSair.deferred_airs += list(list(giver, air, moles / giver.total_moles()))
 	else
-		air.merge(giver)
+		giver.transfer_to(air, moles)
+		update_visuals()
+	return TRUE
+
+/turf/open/assume_air_ratio(datum/gas_mixture/giver, ratio)
+	if(!giver)
+		return FALSE
+	if(SSair.thread_running())
+		SSair.deferred_airs += list(list(giver, air, ratio))
+	else
+		giver.transfer_ratio_to(air, ratio)
+		update_visuals()
+	return TRUE
+
+/turf/open/transfer_air(datum/gas_mixture/taker, moles)
+	if(!taker || !return_air()) // shouldn't transfer from space
+		return FALSE
+	if(SSair.thread_running())
+		SSair.deferred_airs += list(list(air, taker, moles / air.total_moles()))
+	else
+		air.transfer_to(taker, moles)
+		update_visuals()
+	return TRUE
+
+/turf/open/transfer_air_ratio(datum/gas_mixture/taker, ratio)
+	if(!taker || !return_air())
+		return FALSE
+	if(SSair.thread_running())
+		SSair.deferred_airs += list(list(air, taker, ratio))
+	else
+		air.transfer_ratio_to(taker, ratio)
 		update_visuals()
 	return TRUE
 

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -155,7 +155,7 @@ GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)
 /datum/gas_mixture/proc/vv_react(datum/holder)
 	return react(holder)
 
-/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, list/gases)
+/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, ratio, list/gases)
 /datum/gas_mixture/proc/mark_immutable()
 /datum/gas_mixture/proc/get_gases()
 /datum/gas_mixture/proc/multiply(factor)
@@ -183,7 +183,9 @@ GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)
 
 /datum/gas_mixture/proc/transfer_to(datum/gas_mixture/target, amount)
 	//Transfers amount of gas to target. Equivalent to target.merge(remove(amount)) but faster.
-	//Removes amount of gas from the gas_mixture
+
+/datum/gas_mixture/proc/transfer_ratio_to(datum/gas_mixture/target, ratio)
+	//Transfers ratio of gas to target. Equivalent to target.merge(remove_ratio(amount)) but faster.
 
 /datum/gas_mixture/proc/remove_ratio(ratio)
 	//Proportionally removes amount of gas from the gas_mixture
@@ -402,8 +404,7 @@ get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
 		var/transfer_moles = pressure_delta*output_air.return_volume()/(input_air.return_temperature() * R_IDEAL_GAS_EQUATION)
 
 		//Actually transfer the gas
-		var/datum/gas_mixture/removed = input_air.remove(transfer_moles)
-		output_air.merge(removed)
+		input_air.transfer_to(output_air, transfer_moles)
 
 		return TRUE
 	return FALSE

code/modules/atmospherics/gasmixtures/zextools_broke.dm

@@ -56,20 +56,20 @@
 	return gases[gas_type]
 /datum/gas_mixture/set_moles(gas_type, moles)
 	gases[gas_type] = moles
-/datum/gas_mixture/scrub_into(datum/gas_mixture/target, list/gases)
+/datum/gas_mixture/scrub_into(datum/gas_mixture/target, ratio, list/gases)
 	if(isnull(target))
 		return FALSE
 
-	var/list/removed_gases = target.gases
+	var/list/removed_gases = gases
 
 	//Filter it
 	var/datum/gas_mixture/filtered_out = new
 	var/list/filtered_gases = filtered_out.gases
 	filtered_out.temperature = removed.temperature
 	for(var/gas in filter_types & removed_gases)
-		filtered_gases[gas] = removed_gases[gas]
-		removed_gases[gas] = 0
-	merge(filtered_out)
+		filtered_gases[gas] = removed_gases[gas] * ratio
+		removed_gases[gas] = removed_gases[gas] * (1 - ratio)
+	target.merge(filtered_out)
 /datum/gas_mixture/mark_immutable()
 	return
 /datum/gas_mixture/get_gases()

code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm

@@ -72,12 +72,7 @@
 			if(air1.return_temperature() > 0)
 				var/transfer_moles = pressure_delta*environment.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION)
 
-				var/datum/gas_mixture/removed = air1.remove(transfer_moles)
-				//Removed can be null if there is no atmosphere in air1
-				if(!removed)
-					return
-
-				loc.assume_air(removed)
+				loc.assume_air_moles(air1, transfer_moles)
 				air_update_turf()
 
 				var/datum/pipeline/parent1 = parents[1]
@@ -93,11 +88,7 @@
 				moles_delta = min(moles_delta, (input_pressure_min - air2.return_pressure()) * our_multiplier)
 
 			if(moles_delta > 0)
-				var/datum/gas_mixture/removed = loc.remove_air(moles_delta)
-				if (isnull(removed)) // in space
-					return
-
-				air2.merge(removed)
+				loc.transfer_air(air2, moles_delta)
 				air_update_turf()
 
 				var/datum/pipeline/parent2 = parents[2]

code/modules/atmospherics/machinery/components/binary_devices/pump.dm

@@ -81,9 +81,7 @@
 		var/pressure_delta = target_pressure - output_starting_pressure
 		var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION)
 
-		//Actually transfer the gas
-		var/datum/gas_mixture/removed = air1.remove(transfer_moles)
-		air2.merge(removed)
+		air1.transfer_to(air2,transfer_moles)
 
 		update_parents()
 

code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm

@@ -67,9 +67,7 @@
 
 	var/transfer_ratio = transfer_rate/air1.return_volume()
 
-	var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)
-
-	air2.merge(removed)
+	air1.transfer_ratio_to(air2,transfer_ratio)
 
 	update_parents()
 

code/modules/atmospherics/machinery/components/components_base.dm

@@ -120,14 +120,9 @@
 			times_lost++
 		var/shared_loss = lost/times_lost
 
-		var/datum/gas_mixture/to_release
 		for(var/i in 1 to device_type)
 			var/datum/gas_mixture/air = airs[i]
-			if(!to_release)
-				to_release = air.remove(shared_loss)
-				continue
-			to_release.merge(air.remove(shared_loss))
-		T.assume_air(to_release)
+			T.assume_air_moles(air, shared_loss)
 		air_update_turf(1)
 
 /obj/machinery/atmospherics/components/proc/safe_input(var/title, var/text, var/default_set)

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -98,11 +98,6 @@
 	//Actually transfer the gas
 
 	if(transfer_ratio > 0)
-		var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)
-
-		if(!removed)
-			return
-
 		var/filtering = TRUE
 		if(!ispath(filter_type))
 			if(filter_type)
@@ -110,21 +105,10 @@
 			else
 				filtering = FALSE
 
-		if(filtering && removed.get_moles(filter_type))
-			var/datum/gas_mixture/filtered_out = new
-
-			filtered_out.set_temperature(removed.return_temperature())
-			filtered_out.set_moles(filter_type, removed.get_moles(filter_type))
-
-			removed.set_moles(filter_type, 0)
-
-			var/datum/gas_mixture/target = (air2.return_pressure() < 9000 ? air2 : air1)
-			target.merge(filtered_out)
-
-		if(air3.return_pressure() <= 9000)
-			air3.merge(removed)
-		else
-			air1.merge(removed) // essentially just leaving it in
+		if(filtering && air3.return_pressure() <= 9000)
+			air1.scrub_into(air3, transfer_ratio, list(filter_type))
+		if(air2.return_pressure() <= 9000)
+			air1.transfer_ratio_to(air2, transfer_ratio)
 
 	update_parents()
 

code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm

@@ -110,14 +110,12 @@
 	//Actually transfer the gas
 
 	if(transfer_moles1)
-		var/datum/gas_mixture/removed1 = air1.remove(transfer_moles1)
-		air3.merge(removed1)
+		air1.transfer_to(air3, transfer_moles1)
 		var/datum/pipeline/parent1 = parents[1]
 		parent1.update = TRUE
 
 	if(transfer_moles2)
-		var/datum/gas_mixture/removed2 = air2.remove(transfer_moles2)
-		air3.merge(removed2)
+		air2.transfer_to(air3, transfer_moles2)
 		var/datum/pipeline/parent2 = parents[2]
 		parent2.update = TRUE
 

code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm

@@ -66,11 +66,7 @@
 	var/datum/gas_mixture/air_contents = airs[1]
 
 	if(air_contents.return_temperature() > 0)
-		var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION)
-
-		var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
-		loc.assume_air(removed)
+		loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume())
 		air_update_turf()
 
 		update_parents()
@@ -85,9 +81,7 @@
 	injecting = 1
 
 	if(air_contents.return_temperature() > 0)
-		var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION)
-		var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-		loc.assume_air(removed)
+		loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume())
 		update_parents()
 
 	flick("inje_inject", src)

code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm

@@ -50,14 +50,11 @@
 	else if(!opened && our_pressure >= open_pressure)
 		opened = TRUE
 		update_icon_nopipes()
-	if(opened && air_contents.return_temperature() > 0)
+	if(opened)
 		var/datum/gas_mixture/environment = loc.return_air()
-		var/pressure_delta = our_pressure - environment.return_pressure()
-		var/transfer_moles = pressure_delta*200/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION)
-		if(transfer_moles > 0)
-			var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
-			loc.assume_air(removed)
+		var/pressure_delta = abs(our_pressure - environment.return_pressure())
+		if(pressure_delta > 0.1)
+			equalize_all_gases_in_list(list(air_contents,environment))
 			air_update_turf()
 
 			update_parents()

code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm

@@ -109,9 +109,7 @@
 			if(air_contents.return_temperature() > 0)
 				var/transfer_moles = pressure_delta*environment.return_volume()/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION)
 
-				var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
-				loc.assume_air(removed)
+				loc.assume_air_moles(air_contents, transfer_moles)
 				air_update_turf()
 
 	else // external -> internal
@@ -124,11 +122,7 @@
 				moles_delta = min(moles_delta, (internal_pressure_bound - air_contents.return_pressure()) * our_multiplier)
 
 			if(moles_delta > 0)
-				var/datum/gas_mixture/removed = loc.remove_air(moles_delta)
-				if (isnull(removed)) // in space
-					return
-
-				air_contents.merge(removed)
+				loc.transfer_air(air_contents, moles_delta)
 				air_update_turf()
 	update_parents()
 

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -152,28 +152,17 @@
 	var/datum/gas_mixture/environment = tile.return_air()
 	var/datum/gas_mixture/air_contents = airs[1]
 
-	if(air_contents.return_pressure() >= 50*ONE_ATMOSPHERE)
+	if(air_contents.return_pressure() >= 50*ONE_ATMOSPHERE || !islist(filter_types))
 		return FALSE
 
 	if(scrubbing & SCRUBBING)
-		//Take a gas sample
-		var/datum/gas_mixture/removed = tile.remove_air_ratio(volume_rate/environment.return_volume())
+		environment.scrub_into(air_contents, volume_rate/environment.return_volume(), filter_types)
 
-		//Nothing left to remove from the tile
-		if(isnull(removed))
-			return FALSE
-
-		removed.scrub_into(air_contents, filter_types)
-
-		//Remix the resulting gases
-		tile.assume_air(removed)
 		tile.air_update_turf()
 
 	else //Just siphoning all air
 
-		var/datum/gas_mixture/removed = tile.remove_air_ratio((volume_rate/environment.return_volume()))
-
-		air_contents.merge(removed)
+		environment.transfer_ratio_to(air_contents, volume_rate/environment.return_volume())
 		tile.air_update_turf()
 
 	update_parents()

code/modules/atmospherics/machinery/portable/canister.dm

@@ -287,9 +287,8 @@
 
 /obj/machinery/portable_atmospherics/canister/proc/canister_break()
 	disconnect()
-	var/datum/gas_mixture/expelled_gas = air_contents.remove(air_contents.total_moles())
 	var/turf/T = get_turf(src)
-	T.assume_air(expelled_gas)
+	T.assume_air(air_contents)
 	air_update_turf()
 
 	obj_break()

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -42,12 +42,7 @@
 		scrub(T.return_air())
 
 /obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture)
-	var/datum/gas_mixture/filtering = mixture.remove_ratio(volume_rate / mixture.return_volume()) // Remove part of the mixture to filter.
-	if(!filtering)
-		return
-
-	filtering.scrub_into(air_contents,scrubbing)
-	mixture.merge(filtering) // Returned the cleaned gas.
+	mixture.scrub_into(air_contents, volume_rate / mixture.return_volume(), scrubbing)
 	if(!holding)
 		air_update_turf()