Merge pull request #1 from tgstation/master

Back to work
Research machines sorta cleanup

HREF exploits fixed for research machines and vending machines
Who decided to have it like that?
Merge pull request #2697 from Alek2ander/master

HREF exploit fixes and other research stuff