Merge branch 'Issue140' of https://github.com/Carn/-tg-station into Issue140

Conflicts:
	maps/tgstation.2.1.2.dmm - Resolved.
Merge branch 'master' of https://github.com/Giacomand/-tg-station
 * Fixed a typo causing double agents to late join with no objectives.
Merge pull request #818 from Giacomand/db_Fix

* Fixed a typo causing double agents to late join with no objectives.