Revert "Merge pull request #645 from ESwordTheCat/Bleeding-Edge"

This reverts commit 0953b4c79a299bfdc8b099b6569ea54d97ce76ea, reversing
changes made to 4c16846d152099f4acfac25b03d6697e7fb4c1b0.

Conflicts:
	code/__HELPERS/game.dm
Revert "Merge pull request #646 from ESwordTheCat/468VGf31a"

This reverts commit 2152c5902a5398448ec07e057696047222ce03df, reversing
changes made to 542c53fddb6c18f0b86895ec499a02a65a3983cd.
Fix butchered revert.
Merge pull request #648 from d3athrow/revert_645

Revert #645, #646