Fixed!
Merge branch 'Chewing-tobacco' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into Chewing-tobacco