From 4e2406fdd444d012f1e284a2838acb99f53bad8a Mon Sep 17 00:00:00 2001
From: Putnam3145 <putnam3145@gmail.com>
Date: Mon, 10 Oct 2022 23:06:55 -0700
Subject: [PATCH] i've just been retestmerging wrong wow.

---
 code/modules/atmospherics/gasmixtures/gas_mixture.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 7bf4fd556f..fe7a8fdfaf 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -284,7 +284,8 @@ we use a hook instead
 
 /datum/gas_mixture/parse_gas_string(gas_string)
 	gas_string = SSair.preprocess_gas_string(gas_string)
-//	return __auxtools_parse_gas_string(gas_string)
+	return __auxtools_parse_gas_string(gas_string)
+/*
 	var/list/gas = params2list(gas_string)
 	if(gas["TEMP"])
 		var/temp = text2num(gas["TEMP"])
@@ -297,6 +298,7 @@ we use a hook instead
 		set_moles(id, text2num(gas[id]))
 	archive()
 	return 1
+	*/
 /*
 /datum/gas_mixture/react(datum/holder)
 	. = NO_REACTION