Fixes issue #223
https://github.com/d3athrow/vgstation13/issues/223
Merge branch 'Bleeding-Edge' of https://github.com/Aurx/vgstation13 into Bleeding-Edge