Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2

code/modules/atmospherics/environmental/LINDA_system.dm

@@ -40,12 +40,16 @@
 	return FALSE
 
 /turf/proc/ImmediateCalculateAdjacentTurfs()
+	if(SSair.thread_running())
+		CALCULATE_ADJACENT_TURFS(src)
+		return
 	var/canpass = CANATMOSPASS(src, src)
 	var/canvpass = CANVERTICALATMOSPASS(src, src)
 	for(var/direction in GLOB.cardinals_multiz)
 		var/turf/T = get_step_multiz(src, direction)
 		if(!istype(T))
 			continue
+		var/opp_dir = REVERSE_DIR(direction)
 		if(isopenturf(T) && !(blocks_air || T.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(T, src)) : (canpass && CANATMOSPASS(T, src))) )
 			LAZYINITLIST(atmos_adjacent_turfs)
 			LAZYINITLIST(T.atmos_adjacent_turfs)

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -280,11 +280,7 @@ we use a hook instead
 	parse_gas_string(model.initial_gas_mix)
 	return 1
 
-/datum/gas_mixture/proc/__auxtools_parse_gas_string(gas_string)
-
 /datum/gas_mixture/parse_gas_string(gas_string)
-	return __auxtools_parse_gas_string(gas_string)
-	/*
 	gas_string = SSair.preprocess_gas_string(gas_string)
 
 	var/list/gas = params2list(gas_string)
@@ -299,7 +295,6 @@ we use a hook instead
 		set_moles(id, text2num(gas[id]))
 	archive()
 	return 1
-	*/
 /*
 /datum/gas_mixture/react(datum/holder)
 	. = NO_REACTION