Revamp2014

Latest version of my combat system revamp. Read individual commits for more information.