From c46c5d3b54ba4ecca18f1b25a47afb35063ddc00 Mon Sep 17 00:00:00 2001
From: duncathan salt <dunc2403@dunc2403.com>
Date: Thu, 14 Apr 2016 18:28:19 -0600
Subject: [PATCH] makes parse_gas_string() use params2list()

---
 .../atmospherics/gasmixtures/gas_mixture.dm   | 46 ++++---------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index fad61d52549..b78f57a6d3f 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -401,45 +401,15 @@ var/list/gaslist_cache = null
 	return 1
 
 /datum/gas_mixture/parse_gas_string(gas_string)
-	#if DM_VERSION >= 510
-	//global so that we don't have to make them more than once
-	var/global/const/ID = 1
-	var/global/const/VALUE = 2
-	var/global/regex/R
-	if(!R)
-		R = regex("(\\w+?)\\=(\[^;]+)", "g")
-
-	var/list/cached_gases = gases
-	cached_gases.Cut() //clear the list to populate it later
-
-	while(R.next <= length(gas_string))
-		R.Find(gas_string)
-
-		var/id = R.group[ID]
-		if(id == "TEMP")
-			temperature = text2num(R.group[VALUE])
-			continue
+	var/list/gases = src.gases
+	var/list/gas = params2list(gas_string)
+	if(gas["TEMP"])
+		temperature = text2num(gas["TEMP"])
+		gas -= "TEMP"
+	gases.Cut()
+	for(var/id in gas)
 		add_gas(id)
-		cached_gases[id][MOLES] = text2num(R.group[VALUE])
-
-	R.next = 1 //reset it for the next call
-	#else
-	//fml
-	var/global/const/ID = 1
-	var/global/const/VALUE = 2
-
-	var/list/cached_gases = gases
-	cached_gases.Cut()
-
-	var/list/def = splittext(gas_string, ";")
-	for(var/d in def)
-		var/list/gas = splittext(d, "=")
-		if(gas[ID] == "TEMP")
-			temperature = text2num(gas[VALUE])
-			continue
-		add_gas(gas[ID])
-		cached_gases[gas[ID]][MOLES] = text2num(gas[VALUE])
-	#endif
+		gases[id][MOLES] = text2num(gas[id])
 	return 1
 
 /datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)