Removes double spacing from CBM descriptions.
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.
Consider items in a cargo trunk for warmth when sleeping
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