Merge branch 'Ants_veggie' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-Ants_veggie
Merge remote-tracking branch 'KA101/master'