tgstation/-tg-station — pull request #5526 by Incoming5643 (2014-10-29 05:27:55+00:00)
Title: I must have been really tired when I wrote #4846

Fixes #5515
Fixes #5517