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.
L39B

Another fine product from Leadworks, LLC!

This futuristic selective-fire handgun is just the thing for home
defense, law enforcement, or--in the event of societal collapse--ensure
that dead or alive, they're not coming after you.
More spawn groups

Should probably sell it in stores, no?
Merge pull request #8465 from KA101/p-p-pow

DEAD OR ALIVE YOU'RE COMING WITH ME.
Gives Robocop the proper gun.
Nerfs herbal tea a bit.
Merge pull request #8466 from Rivet-the-Zombie/the-Auto-9-lives

Gives Robocop the proper gun.
Merge pull request #8467 from Rivet-the-Zombie/herbal-tea-tweak

Nerfs herbal tea a bit.
Fixes a copy/paste error.
Merge pull request #8468 from Rivet-the-Zombie/flare-derp-fix

Fixes a copy/paste error.
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.