Merge branch 'master' of https://github.com/Baystation12/Baystation12

Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm
	html/changelog.html
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Reagents.dm
	html/changelog.html
Now completely merged.. damn git.
Furry delight, more facial hairs and hairstyles for space cats.
Sprites provided by Mister_Fox
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
Some missing icons
Ticked 2.1.0.0.1
Placed virus2 viro machinery in Virology
Should stop robolimbs bleeding.
Return of Moderator III: This is Getting Old.
Fixed mods back in, should have all powers they did.
Mod panel is MIA< let them use same admins use, can't do shit without having rights anyway.
Fixed appendicitis killing people in 4 minutes.
Also from stage 2 and on, symptoms of lower stages can appear too.
Nerfed environmental robusting a bit
Blood now goes to vessels again.
Virus2 machinery in Virology.
IA office.
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
Fixed air controller not advancing.
Derps fixed
Merge pull request #2217 from comma/master

Latest merge fixes & Map
Merge remote-tracking branch 'bs12/bleeding-edge-freeze'

Conflicts:
	baystation12.dme
	maps/RandomZLevels/fileList.txt
	maps/tgstation.2.1.0.0.1.dmm
Merge branch 'master' of https://github.com/tehdrama/NanotrasenStation