Added 'asked to train' and 'asked personal info'
Merge branch 'npc_stats_window' of https://github.com/acidia/Cataclysm-DDA into npc
Merge remote-tracking branches 'dda/pr/8278', 'dda/pr/8279', 'dda/pr/8284', 'dda/pr/8289' and 'dda/pr/8290' into dda-master

* dda/pr/8278:
  Updated CMakeLists.txt

* dda/pr/8279:
  More grid access refactors.

* dda/pr/8284:
  Move player designated zones into player class/their own files.

* dda/pr/8289:
  Adds locked gates to hacksaw target list

* dda/pr/8290:
  Restores shock_staff damage
Pain-check

This fixes #7781 by interrupting activities/sleep when you take pain.
Might go better in creature.cpp's mod_pain; I'm not sure if NPCs handle
that yet.
Merge pull request #2 from CleverRaven/master

Update
Added mission_end, thankful
Added mission_end, thankful
Restore mission values and requested missions->thankful
Added new responses for marshal badge
End conversation after trading with strangers

This prevents the NPC from starting a second check to ask you to drop your weapon.
Updated factions to account for player's as id 0
contact lenses->effects, removed unused disease enums
Updated factions so 'Your Followers' is first
(CR) Clothing upgrade

Seeing as we're asking folks to start in mid-March 20-50F, rather than
65F, I think it's only fair we let 'em evac with a bit warmer gear.

The Generic Survivor gets a light jacket, and everyone who doesn't have
a clear reason NOT to have socks gets a pair.  (It's truly amazing how
many folks didn't have socks!)

This is open to discussion and changes; for instance, I could agree with
issuing a sweatshirt instead of the T-shirt & jacket combo.  Let's talk!
Hide 'Your Followers' until you have some
Spacing fixes for tools.

And a spelling fix while we're at it.
boomered->effects
fix JSON

Thanks for the catch, Rivet.
Merge branch 'shared-save-iteration-fix' of https://github.com/kevingranade/Cataclysm-DDA into linux
Merge branch 'linux'