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

# Conflicts:
#	code/modules/ninja/suit/suit.dm

code/modules/admin/verbs/debug.dm

@@ -581,7 +581,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.set_moles(/datum/gas/plasma,70)
+				Plasma.air_contents.set_moles(GAS_PLASMA,70)
 				Rad.drainratio = 0
 				Rad.loaded_tank = Plasma
 				Plasma.forceMove(Rad)

code/modules/admin/verbs/diagnostics.dm

@@ -10,7 +10,7 @@
 	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"
+			lines += "[GLOB.gas_data.names[id]]: [moles] mol"
 	to_chat(usr, lines.Join("\n"))
 
 /client/proc/air_status(turf/target)