Fixed combat bugs
Merge branch 'master' of https://github.com/ShortCircuitGame/Short-Circuit