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

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -909,10 +909,9 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
 				assoc = SDQL_expression(object, expressions_list[expression_list])
 			if(assoc != null)
 				// Need to insert the key like this to prevent duplicate keys fucking up.
-				var/list/dummy = list()
-				dummy[result] = assoc
-				result = dummy
-			val += result
+				val[result] = assoc
+			else
+				val += list(result)
 	else
 		val = world.SDQL_var(object, expression, i, object, superuser, src)
 		i = expression.len

code/modules/admin/verbs/debug.dm

@@ -573,7 +573,7 @@
 		if(Rad.anchored)
 			if(!Rad.loaded_tank)
 				var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
-				Plasma.air_contents.gases[/datum/gas/plasma] = 70
+				Plasma.air_contents.set_moles(/datum/gas/plasma,70)
 				Rad.drainratio = 0
 				Rad.loaded_tank = Plasma
 				Plasma.forceMove(Rad)

code/modules/admin/verbs/diagnostics.dm

@@ -1,15 +1,14 @@
 /proc/show_air_status_to(turf/target, mob/user)
 	var/datum/gas_mixture/env = target.return_air()
-	var/list/env_gases = env.gases
 	var/burning = FALSE
 	if(isopenturf(target))
 		var/turf/open/T = target
 		if(T.active_hotspot)
 			burning = TRUE
 
-	var/list/lines = list("<span class='adminnotice'>[AREACOORD(target)]: [env.temperature] K ([env.temperature - T0C] C), [env.return_pressure()] kPa[(burning)?(", <font color='red'>burning</font>"):(null)]</span>")
-	for(var/id in env_gases)
-		var/moles = env_gases[id]
+	var/list/lines = list("<span class='adminnotice'>[AREACOORD(target)]: [env.return_temperature()] K ([env.return_temperature() - T0C] C), [env.return_pressure()] kPa[(burning)?(", <font color='red'>burning</font>"):(null)]</span>")
+	for(var/id in env.get_gases())
+		var/moles = env.get_moles(id)
 		if (moles >= 0.00001)
 			lines += "[GLOB.meta_gas_names[id]]: [moles] mol"
 	to_chat(usr, lines.Join("\n"))