Merge pull request #2 from tgstation/master

tg master merge
Sparks!
Sparks!
Merge pull request #1475 from ACCount12/sparky

Sparks!