ensured consistency with air-spawning atoms

2021-02-25 00:43:43 -08:00
parent c641c523bd
commit 0211e78c0c
6 changed files with 33 additions and 5 deletions
@@ -131,5 +131,4 @@

 	var/datum/gas_mixture/G = new
 	G.parse_gas_string(text)
-
-	air.merge(G)
+	assume_air(G)
@@ -48,8 +48,11 @@
 /turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
 	if(!giver)
 		return FALSE
-	air.merge(giver)
-	update_visuals()
+	if(SSair.thread_running())
+		SSair.deferred_airs += list(list(src, giver))
+	else
+		air.merge(giver)
+		update_visuals()
 	return TRUE

 /turf/open/remove_air(amount)