Merge pull request #1 from CleverRaven/master

a
Merge pull request #2 from CleverRaven/master

a1
Merge pull request #3 from CleverRaven/master

c
Prevents using label command if it's grayed out
Adds everything I've been workming on and fighting to make github accept properly for the past couple of hours
Remove any benefits of eating meat if you're a herbivore. Fixes #8790.
Merge branch 'relabel-fix' of https://github.com/EpicOrange/Cataclysm-DDA into merge
JSON format issues

Nothing terribly difficult.
Merge branch 'cows-hate-meat' of https://github.com/kevingranade/Cataclysm-DDA into merge
New flamethrower/flamethrower tweaks.

New weapon is noncraftable and appears in military and military_hw spawn
groups. Uses a new NO_BOOM flag to suppress the normal FLAME effect of
its ammunition and use a new FIRE_20 flag to make firing cost 20 charges
per shot.

Gives the vanilla spawn-only flamethrower a much-needed range boost to
make it more competitive with the craftable flamethrower_simple.

Also grants INCENDIARY flag to gasoline and expands FLARE to work as a
weapon flag in addition to as an ammo flag.
Tweaks stats for army helmet.

Because it actually kind of sucked compared to stuff like the common
bicycle helmet.
Air, spotlight, rubble fix for Hoder's
Small plastic bottles
fix
Rebalance
Tab killer
Make map::is_bashable check for inbounds() first.

Fixes #9051 (or, at least, seems to do so on my save).

It's still unclear to me why `monster::move` sometimes finds negative
coordinates to check (notably, only negative X so far, though this might
just be coincidence), but making sure we're in-bounds for the current
map will certainly prevent *this* crash from occurring again.
Tab killer 2: revenge
Spawn lists
Spawn lists for canvas bags