Atmos added to the map.

Signed-off-by: Electronics <lauriekirkcaldy@yahoo.co.uk>
Merge branch 'master' of https://github.com/Electronics/UristMcStation

Conflicts:
	tgstation.int