Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

code/game/objects/structures/holosign.dm

@@ -94,7 +94,7 @@
 	alpha = 150
 	resistance_flags = FIRE_PROOF
 
-/obj/structure/holosign/barrier/firelock/blocksTemperature()
+/obj/structure/holosign/barrier/firelock/BlockSuperconductivity()
 	return TRUE
 
 /obj/structure/holosign/barrier/combifan
@@ -110,7 +110,7 @@
 	CanAtmosPass = ATMOS_PASS_NO
 	resistance_flags = FIRE_PROOF
 
-/obj/structure/holosign/barrier/combifan/blocksTemperature()
+/obj/structure/holosign/barrier/combifan/BlockSuperconductivity()
 	return TRUE
 
 /obj/structure/holosign/barrier/combifan/Initialize()

code/game/objects/structures/transit_tubes/station.dm

@@ -152,8 +152,8 @@
 		pod_moving = 0
 		if(!QDELETED(pod))
 			var/datum/gas_mixture/floor_mixture = loc.return_air()
-			ARCHIVE(floor_mixture)
-			ARCHIVE(pod.air_contents)
+			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
 			air_update_turf()
 

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -10,9 +10,9 @@
 
 /obj/structure/transit_tube_pod/Initialize()
 	. = ..()
-	air_contents.gases[/datum/gas/oxygen] = MOLES_O2STANDARD
-	air_contents.gases[/datum/gas/nitrogen] = MOLES_N2STANDARD
-	air_contents.temperature = T20C
+	air_contents.set_moles(/datum/gas/oxygen, MOLES_O2STANDARD)
+	air_contents.set_moles(/datum/gas/nitrogen, MOLES_N2STANDARD)
+	air_contents.set_temperature(T20C)
 
 
 /obj/structure/transit_tube_pod/Destroy()
@@ -181,4 +181,4 @@
 						return
 
 /obj/structure/transit_tube_pod/return_temperature()
-	return air_contents.temperature
+	return air_contents.return_temperature()