Tendril dev

Should be the initial work on bore & inject fungal infectors.  Decent
point-defense but vulnerable at range.
Tendril tweaks

OK, they work.  Now to install 'em.
Forgot something important

Yeah, the reset is kinda important.
Blossom In Progress

Committing to shift branches.
More work on the fungal field

Still WIP, committing to change branches.
shifting gears again
Blossoms firing

OK, got the fungal blossoms firing but make_fungus appears to be broken.
Committing to create a breakpoint.
make_fungus fix

Tweaks to the fungal_haze and an update to make_fungus.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into marloss
Spear of Light in the Darkness!

Working mapgen prototype.  Build a new map and you can see the new
blooms in action.
Fruiting In Progress

Begun work on the new marloss fruits, committing to change branches for
potential bugfix.
Fruiting compiles

For whatever reason it's refusing to find f_flower_marloss.  No idea
why.
flower fix

Thanks for the spot check, Kevin.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into marloss

Conflicts:
	data/json/furniture.json
	src/iexamine.cpp
	src/iexamine.h

Hoping it works as well here as it did in the trial branch.
Marloss infrastructure complete

This get the critters and spawns working, sets up the comestibles, and
includes the working fire-suppressor.  Thanks for the spotting, Kevin.
It's always the little things.

On balance fungal spawns are a bit rarer, but now there are three of
them, so total amount of fungus out to stay similar.

I'd like to get these merged sooner rather than later, but if you want a
few steps up the categories, I can work those out.
Tendril buffs

Little more of a challenge to melee folks, and discourages shooting the
individual tendrils.
Update options.cpp
add fallback
Merge pull request #8875 from cellxiecao/master

Make languege name for zh_CN shorter
fix copy/paste code