April 28 Hotfix

Quick hotfix to fix the bug where the game'll skip over player uprisings. Should work now.

Also, had to remove the "Skip All" option for combat to balance it out, because it didn't really work with the gameplay loop.

Anyways, I"ll be running more QA over the next few hours.

-Chris