Merge pull request #1 from tgstation/master

Fix my own branch,
Merge pull request #3 from tgstation/master

Fix my own branch,
Update tools.dm
Merge pull request #6296 from NecroticBinder/Tech-Fix

Tech fix