Merge branch 'bleeding-edge-freeze' of git://github.com/Gamerofthegame/Baystation12
Merge pull request #2281 from comma/master

Samll fixes
I am tired of doing this
Merge pull request #2287 from Gamerofthegame/master

Map and RIG changes
Merge branch 'master' of github.com:Baystation12/Baystation12
Virus event is now again virus2.
Merge pull request #2295 from CIB/master

Fix virus event
Removes new event code and reinstates old event code.
Merge pull request #2298 from CIB/master

Removes new event code and reinstates old event code
Merge branch 'master' of https://github.com/Baystation12/Baystation12