Shield and Fixes

Added shield, fixed some crashes related to combat mostly
Merge branch 'master' of https://github.com/FarmerZaku/greece