A lot of Stuff From: #2849

https://github.com/tgstation/-tg-station/pull/2849
fix
boom - will redo
Map
Boop
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
Fixes conflicts
Merge pull request #2917 from Cheridan/master

Conflict fixes of #2857