Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/AndroidSFV/UMcS
Terran Confederacy trader outfit.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS