Merge pull request #5 from CleverRaven/master

Update
Missed 'my_fac != NULL' check
Merge pull request #8124 from acidia/evac_center_quickfix

NPC faction check fix
Only trigger crainal detonation if NPC is not spenting moves.
Removes double spacing from CBM descriptions.
Move manipulation of faction reputation inside npc method.
Merge pull request #8126 from kevingranade/npc-fixes

Npc fixes
Too many items fix for professions.
Mapgen fix: lab and pawn shop

Prevent walls on top/left side of labs with a fixed map. Prevents the
furniture there to be stuck in walls.

Remove furniture from office in pawn shop, to prevent the line of
counters/display racks going through the wall into the other room.
Remove web before bashing the map

When smashing at the map, remove webs first, when there are no webs continue as normal.
Consider items in a cargo trunk for warmth when sleeping
Escape apostrophe in archaeologist profession description that was breaking farmer and patriot definitions.
Merge remote-tracking branches 'dda/pr/8125', 'dda/pr/8128' and 'dda/pr/8130' into dda-master

* dda/pr/8125:
  Removes double spacing from CBM descriptions.

* dda/pr/8128:
  Mapgen fix: lab and pawn shop

* dda/pr/8130:
  Consider items in a cargo trunk for warmth when sleeping
Merge pull request #8127 from Rivet-the-Zombie/too-many-things!

Too many items fix for professions.
Removes disassembly option from a few improvised weapons.
Revert bowling pin weapon-thing.
Merge pull request #8131 from Rivet-the-Zombie/no-disassembly-nailbat

Removes disassembly option from a few improvised weapons.
Merge branch 'webs-smash-em' of https://github.com/BevapDin/Cataclysm-DDA into web
Limit number of profession items printed so they stay within the window.
Revert "Too many items fix for professions."

This reverts commit 63ea4a97b18d6424c52c2460008091818ec782aa.
Now the window will handle having too many items to list properly.