Testing branching again
Testing branching again

Signed-off-by: Perakp <perhal90@hotmail.com>
Fixes indentation
Merge branch 'testBranch' of https://github.com/Perakp/-tg-station into testBranch

Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/special.dm
Changed admin.txt back to normal, resolves merge abortions (I hope)
Merge pull request #1654 from Perakp/testBranch

Empty staves whizzle instead of *click*