From 14a68a62df7a780e76ddf01c1d9cc8e64a31fdf5 Mon Sep 17 00:00:00 2001
From: Aranclanos <aranclanos@hotmail.com>
Date: Wed, 16 Sep 2015 16:18:58 -0300
Subject: [PATCH] Removes some commented out code in datum_pipeline.dm that I
 originally forgot to scrap out.

---
 code/ATMOSPHERICS/datum_pipeline.dm | 142 +---------------------------
 1 file changed, 1 insertion(+), 141 deletions(-)

diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm
index 4036e5a1f10..b4547824db6 100644
--- a/code/ATMOSPHERICS/datum_pipeline.dm
+++ b/code/ATMOSPHERICS/datum_pipeline.dm
@@ -267,144 +267,4 @@ var/pipenetwarnings = 10
 						corresponding = new trace_gas.type()
 						G.trace_gases += corresponding
 
-					corresponding.moles = trace_gas.moles*G.volume/total_volume
-
-
-/*
-/datum/pipeline/proc/mingle_with_turf(turf/simulated/target, mingle_volume)
-	var/datum/gas_mixture/air_sample = air.remove_ratio(mingle_volume/air.volume)
-	air_sample.volume = mingle_volume
-
-	var/datum/gas_mixture/turf_air = target.return_air()
-
-	equalize_gases(list(air_sample, turf_air))
-	air.merge(air_sample)
-	//turf_air already modified by equalize_gases()
-
-	if(istype(target))
-		if(target.air)
-			if(target.air.check_tile_graphic())
-				target.update_visuals(target.air)
-	update = 1
-
-/datum/pipeline/proc/reconcile_air()
-	//Perfectly equalize all gases members instantly
-
-	//Calculate totals from individual components
-	var/total_thermal_energy = 0
-	var/total_heat_capacity = 0
-	var/datum/gas_mixture/air_transient = new()
-	var/list/gases = list(air)
-	gases.Add(other_airs)
-	for(var/datum/gas_mixture/gas in gases)
-		air_transient.volume += gas.volume
-		total_thermal_energy += gas.thermal_energy()
-		total_heat_capacity += gas.heat_capacity()
-
-		air_transient.oxygen += gas.oxygen
-		air_transient.nitrogen += gas.nitrogen
-		air_transient.toxins += gas.toxins
-		air_transient.carbon_dioxide += gas.carbon_dioxide
-
-		if(gas.trace_gases.len)
-			for(var/datum/gas/trace_gas in gas.trace_gases)
-				var/datum/gas/corresponding = locate(trace_gas.type) in air_transient.trace_gases
-				if(!corresponding)
-					corresponding = new trace_gas.type()
-					air_transient.trace_gases += corresponding
-
-				corresponding.moles += trace_gas.moles
-
-	if(air_transient.volume > 0)
-
-		if(total_heat_capacity > 0)
-			air_transient.temperature = total_thermal_energy/total_heat_capacity
-
-			//Allow air mixture to react
-			if(air_transient.react())
-				update = 1
-
-		else
-			air_transient.temperature = 0
-
-		//Update individual gas_mixtures by volume ratio
-		for(var/datum/gas_mixture/gas in gases)
-			gas.oxygen = air_transient.oxygen*gas.volume/air_transient.volume
-			gas.nitrogen = air_transient.nitrogen*gas.volume/air_transient.volume
-			gas.toxins = air_transient.toxins*gas.volume/air_transient.volume
-			gas.carbon_dioxide = air_transient.carbon_dioxide*gas.volume/air_transient.volume
-
-			gas.temperature = air_transient.temperature
-
-			if(air_transient.trace_gases.len)
-				for(var/datum/gas/trace_gas in air_transient.trace_gases)
-					var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases
-					if(!corresponding)
-						corresponding = new trace_gas.type()
-						gas.trace_gases += corresponding
-
-					corresponding.moles = trace_gas.moles*gas.volume/air_transient.volume
-	return 1
-
-/proc/equalize_gases(datum/gas_mixture/list/gases)
-	//Perfectly equalize all gases members instantly
-
-	//Calculate totals from individual components
-	var/total_volume = 0
-	var/total_thermal_energy = 0
-	var/total_heat_capacity = 0
-
-	var/total_oxygen = 0
-	var/total_nitrogen = 0
-	var/total_toxins = 0
-	var/total_carbon_dioxide = 0
-
-	var/list/total_trace_gases = list()
-
-	for(var/datum/gas_mixture/gas in gases)
-		total_volume += gas.volume
-		total_thermal_energy += gas.thermal_energy()
-		total_heat_capacity += gas.heat_capacity()
-
-		total_oxygen += gas.oxygen
-		total_nitrogen += gas.nitrogen
-		total_toxins += gas.toxins
-		total_carbon_dioxide += gas.carbon_dioxide
-
-		if(gas.trace_gases.len)
-			for(var/datum/gas/trace_gas in gas.trace_gases)
-				var/datum/gas/corresponding = locate(trace_gas.type) in total_trace_gases
-				if(!corresponding)
-					corresponding = new trace_gas.type()
-					total_trace_gases += corresponding
-
-				corresponding.moles += trace_gas.moles
-
-	if(total_volume > 0)
-
-		//Calculate temperature
-		var/temperature = 0
-
-		if(total_heat_capacity > 0)
-			temperature = total_thermal_energy/total_heat_capacity
-
-		//Update individual gas_mixtures by volume ratio
-		for(var/datum/gas_mixture/gas in gases)
-			gas.oxygen = total_oxygen*gas.volume/total_volume
-			gas.nitrogen = total_nitrogen*gas.volume/total_volume
-			gas.toxins = total_toxins*gas.volume/total_volume
-			gas.carbon_dioxide = total_carbon_dioxide*gas.volume/total_volume
-
-			gas.temperature = temperature
-
-			if(total_trace_gases.len)
-				for(var/datum/gas/trace_gas in total_trace_gases)
-					var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases
-					if(!corresponding)
-						corresponding = new trace_gas.type()
-						gas.trace_gases += corresponding
-
-					corresponding.moles = trace_gas.moles*gas.volume/total_volume
-
-	return 1
-*/
\ No newline at end of file
+					corresponding.moles = trace_gas.moles*G.volume/total_volume
\ No newline at end of file