Superconductivity is gone. Only rustmos now.

2020-11-17 02:35:10 -08:00
parent 43d4ad8c12
commit 30fb673670
27 changed files with 79 additions and 400 deletions
@@ -149,9 +149,9 @@
 		pod_moving = 0
 		if(!QDELETED(pod))
 			var/datum/gas_mixture/floor_mixture = loc.return_air()
-			floor_mixture.archive()
-			pod.air_contents.archive()
-			pod.air_contents.share(floor_mixture, 1) //mix the pod's gas mixture with the tile it's on
+			var/tot_volume = pod.air_contents.return_volume() + floor_mixture.return_volume()
+			pod.air_contents.merge(floor_mixture.remove_ratio(1))
+			floor_mixture.merge(pod.air_contents.remove_ratio(floor_mixture.return_volume()/tot_volume))
 			air_update_turf()

 /obj/structure/transit_tube/station/init_tube_dirs()