Merge pull request #336 from widd/1.7-update

Adds DMT and corresponding potion effects when consumed