Stomach
Stupid mistake fix
Fix one stupid mistake.
Merge branch 'master' into stomath

Conflicts:
	src/player.cpp
	src/player.h
	src/savegame_json.cpp
Aftermegre fixes
Fix
Fixes a few typos and minor spelling errors in npctalk.cpp.
Merge pull request #8470 from Rivet-the-Zombie/npc-talk-typo-fix

Fixes a few typos and minor spelling errors in npctalk.cpp.
Initial attempt, needs compile-checked

Not gonna fire up C::B at 5:13 AM.
Fix mansion mapgen:

The walls to the left and bottom must not be rotated, those walls are created by every mansion
mapgen (even by the non-entrance ones). The non-entrance mansion mapgen creates them but does *not* rotate them.
To match this, the entrance should not rotate them either.

Further: made the columns in the entrance symmetrical (6 squares between
each row, not 5, matches the double door).
Fix mapgen of military outpost:

Increase the enclosed area (moved the chain link fences to outer edge of the generated area).
Check and discard overlapping rooms.
Check and fix doors leading into the wall of an adjacent room.
Added recipe search by skill function
Fixed bug where cowboy hat costed 4 leather to make but could be cut up for 8, allowing infinite leather patches.
Null pointer accounted for
Change game::events into a std::list instead of vector.

Some events add new events to the list while it is being processed.
This invalidates the iterators of std::vector that are used during that processing.
Recipe searching now displays results in descending order of difficulty
Merge branch 'infinite_hats' of https://github.com/BeigeSand/Cataclysm-DDA into merge
Merge branch 'fix-event-iterator-bug' of https://github.com/BevapDin/Cataclysm-DDA into merge
Fix spawn-targeting typo

Probably not critical, but it was there.
A slight modification to the names of fish bait.

Surely I'm not the only one who was confused the first time I saw 'meat
bait fish' in a book's recipe list.