astyle
Merge branch 'inv' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-inv
- Increased difficulty of learning from chemistry textbooks (5->6)
- Increased time to make (1500 -> 10000)
- Added chemistry charges (-1 -> 25)
Merge pull request #6266 from illi-kun/inv

astyle inventory.cpp
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Updated the description of the granade. As Starfyre had some issues with it and didn't realize just how gameruining this joke item can be.
now less emo. (removed the stupid ... from the description).
Merge remote-tracking branch 'KA101/master'
Merge remote-tracking branch 'Soyweiser/Boom_goes_the_dynamite'
Merge remote-tracking branch 'Soyweiser/granade_warning'