Few fixes
Merge branch 'master' of https://github.com/Intercross21/Baystation12

Conflicts:
	code/modules/admin/verbs/adminhelp.dm