reverted revert
Merge branch 'ReworkGameplay' of github.com:kellyelton/OCTGN into ReworkGameplay