Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into TheJob
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
Flower work, begin roots

Starting work on the downsides, hoping to get these nailed down shortly.
Chronic Low Morale isn't fun, and I don't recommend you try it.
Check that we have enough charges, not just any at all.
Stylin is outta control.
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod
Merge remote-tracking branch 'KA101/TheJob' into FrankenMod
Merge remote-tracking branch 'kevingranade/no-infinitazer' into FrankenMod