tgstation/-tg-station — pull request #751 by caelaislinn (2013-06-10 12:31:35+00:00)
Title: ASTAR Hotfixes Mark II

Do not merge. This pull request is placed here for communal review while I test it to get some comparisons.

See commit log for exact changes.