Merge branch 'bleeding-edge-freeze' of git://github.com/Gamerofthegame/Baystation12
removed old event files, re-added old ion storm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
tweaks to a couple of random events, removed spider infestation and alien infestation from random list

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
I am tired of doing this
Merge pull request #2287 from Gamerofthegame/master

Map and RIG changes
Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver.
Merge pull request #2293 from CIB/feature

Merge master bugfixes into BEF
Added NT relation preference.
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
Merge pull request #2285 from caelaislinn/bleeding-edge-freeze

Merge from master, post TG update feedback
bad indentation on one of cocktails
readded painkillers YET AGAIN
Readded limb cutoff surgery.
Merge branch 'master' of https://github.com/Baystation12/Baystation12