Hitbox fixes combined with some shield changes

This PR is to discuss/review the code, any changes will be made on this fix-hitboxes branch at FAForever/fa.
Litte bit bad indentation, let's fix that