Fixes issue #223, https://github.com/d3athrow/vgstation13/issues/223
Also, I can officially into git now.
Merge branch 'Bleeding-Edge' of https://github.com/Aurx/vgstation13