Merge branch 'bleeding-edge-freeze' of git://github.com/Gamerofthegame/Baystation12
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.
Fixed msay links.
Merge pull request #2298 from CIB/master

Removes new event code and reinstates old event code
bad indentation on one of cocktails
readded painkillers YET AGAIN
Readded limb cutoff surgery.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Okay, mapmerger don't fail me...
Changes to camera tags for renamed areas.
Fixed PACMAN causing infinite loops in power nets.
Merge pull request #2302 from comma/master

Hooonk, critical fix.
Merge resolution.
Icons and code for an NT-knockoff soghun space suit.
Merge pull request #2313 from Zuhayr/master

New hardsuit, fixes from master.
Merge remote-tracking branch 'bs12/bleeding-edge-freeze'

Conflicts:
	baystation12.dme