inserting code to correct funnel behavior

https://github.com/CleverRaven/Cataclysm-DDA/issues/7208

Funnels were not updating correctly, we discussed this change in the above issue thread.
Rapid mutation, mutated-Toughness

These add post-Thresh variants of Tough, which stack with the starting
traits: there shouldn't be any trouble getting enough HP now.  Added a
faster version of Genetically Unstable as well, exclusive to post-Thresh
Chimera.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into TheJob
Botched update
Revert "Botched update"

This reverts commit 6d7bb8d62bbce8194a1cec0f073dc41cf22b7375.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into TheJob
Plant In Progress

Committing to save and deal with some stuff.
Work
In
Progress
Merge branch 'TheJob' of https://github.com/KA101/Cataclysm-DDA into TheJob
Plant plans, Saprophage

This lays out the rest of the Plant post-thresh and nails down the "Eat
*only* rotten food" mutation.
Committing to update

Should have Flowering nailed down and work on Chloromorphosis, but the
C++11 conversion needs brought back on board.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into TheJob
Flower work, begin roots

Starting work on the downsides, hoping to get these nailed down shortly.
Chronic Low Morale isn't fun, and I don't recommend you try it.
(CR) ROOTS2

OK, basic rooting behavior is here.  Looking at pretty decent but random
food/quench/health gain if you take a while doing sedentary things on
diggable terrain.
Translation note
Ground-handling, ROOTS3

ROOTS3 gives a lesser chance to extract nutrition but does so absolutely
every time you're on diggable terrain.  Slows you up in the process,
too.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into TheJob

Conflicts:
	src/player.cpp

It's update time!
Rest of Chloromorphosis.  It give significant boosts to folks sleeping in soil, but makes it impossible to sleep anywhere else.
Requires sunlight for photosynthesis

Helps to have sunlight!
player::rooted()

Consolidates the rooting code in most places where it's generic; the
reading code remains based on cycle-time.
Post-thresh dreams

Long overdue.  This adds a fourth level of mutation strength
(post-threshold) and assigns dreams accordingly.