I believe this fixes #7628. Seemed to just be a bit of logic mixup.
Merge remote-tracking branch 'upstream/master' into martial-arts-block-fix
Fixing my interpretation of bionics and blocking. No hp, no blocking, even with bionics.
Merge remote-tracking branch 'upstream/master' into martial-arts-block-fix
Merge remote-tracking branch 'upstream/master' into martial-arts-block-fix
Essentially same changes wishbringer made before I could get back to this. Pushing to my own repo just so I have a completed branch.
Fixed CodeBlocks build for c++11
Fix typo pointed out by Khrysanth.
Merge remote-tracking branches 'dda/pr/7708' and 'dda/pr/7717' into dda-master

* dda/pr/7708:
  Essentially same changes wishbringer made before I could get back to this. Pushing to my own repo just so I have a completed branch.
  Fixing my interpretation of bionics and blocking. No hp, no blocking, even with bionics.
  I believe this fixes #7628. Seemed to just be a bit of logic mixup.

* dda/pr/7717:
  Fixed CodeBlocks build for c++11
Check that we have enough charges, not just any at all.
Stylin is outta control.