Merge pull request #1 from Baystation12/master

Repo updates
Toxin changes to meet Science whinings.
Merge branch 'master' of https://github.com/Gamerofthegame/Baystation12
Minor Toxins change fixes
Merge pull request #2303 from Gamerofthegame/master

Map: Toxins update