Remove -Wno-unused-parameter.
Merge easier exiting of vehicle control menu.
Fish buff

This makes morale bonuses noticeably easier to get as a Fish.  Still not
perfectly intuitive.
Water flags

For all the fishfolk out there who have trouble finding gear.
Replaces doubled 556 entry with two types of 40mm grenades.
MOAR BULLITZ
MOAR 556!
Fix insanely broken wet_protection system that probably never worked.
Merge pull request #4748 from yobbobanana/mut_testing

Fix insanely broken wet_protection system that probably never worked.
Merge https://github.com/CleverRaven/Cataclysm-DDA into creature-rework
Refactor and fix blocking with martial arts.

Conflicts:
	src/melee.cpp
Fall back to -1 instead like no_style, and use that rather than 0.
Merge branch 'merge-MA-changes' into ma-block-fix

Conflicts:
	src/melee.cpp
misc *_group fixes and dehackifications

mongroup: provide non-autovivicating means of validity checking.
item_groups.json: guns_with_ammo boolean to replace hard-coded if group == "livingroom" || "behind_counter"
mapgen place_spawns/items: implement the above and _whine_ instead of spitting out null_item or who knows what
Merge martial art block fixes and door scent fixes.
Made window size option less ambiguous.

Reworded the new window display size for the window size options to be
less ambiguous about what size it's currently representing (the old size
vs the new size).
misc *_group fixes and dehackifications

mongroup: provide non-autovivicating means of validity checking.
item_groups.json: guns_with_ammo boolean to replace hard-coded if group == "livingroom" || "behind_counter"
mapgen place_spawns/items: implement the above and _whine_ instead of spitting out null_item or who knows what
item factory load: use global body_parts string-to-int map, nuke
set_bitmask_by_string(...) as it was only used by set_flag_by_string(...),
and casting body_parts to map<Item_tag, unsigned> no workie.

Also eliminate std::string init frenzy via const std::string & args
nuke-a-comment(tm)
json(array|object).throw_error("string"); what it says on the tin