addapt the retroactive funnel function to the new weather generator
removed unnecessary weather_log reference from map.cpp
Merge pull request #8178 from Meowasaurus/mushroom_cat

Fix #8174 Changed dehydrated mushroom category to veggi
Merge branch 'pickup-wielded-invlet' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'option-fixes' of https://github.com/OzoneH3/Cataclysm-DDA into merge
Merge branch 'martial_art-display' of https://github.com/BevapDin/Cataclysm-DDA into merge
Added NC_THUG spawn and corrected bandit
Merge branch 'ambient-sound' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'translate-motd-and-credits' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'remove-tabs' of https://github.com/BevapDin/Cataclysm-DDA into merge
Moved NPC inventories to thier class files
Further Item Re-work and Cleanup
Added item spawns and some bandits->thugs
Added message for when NPCs miss in melee

I thought they weren't attacking at all until I tracked it down.
Increased the random weapon group size
Updated for new fields and ported shop inventory
Create NC_BOUNTY_HUNTER.json
Create NC_COWBOY.json
Create NC_DOCTOR.json
Create NC_EVAC_SHOPKEEP.json