Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Decay and miss msgs
Merge to mainline

Conflicts:
	data/json/monsters.json
	src/game.cpp
	src/player.cpp
Compilation fixes
Adrenaline

Thanks to KA101 for the mycus version messages!
Meth
Remove unused disease function
get_effect_dur() and get_effect_int()
Cigs
Scaling mods now apply on intensity > 1
Grack
Teleglow and being high
Amigara drunks
Asthma
Crushed
Weed and stemcells
Valium
Relax Gas
Tapeworms