Aran, could it be merged into one var/datum/gas_mixture/G that's used throughout? How expensive is return_air()?
The locker stuff should probably be fixed by non-airtight lockers having an extended return_air(), I'd have thought?