Merge pull request #6099 from KA101/typofix

fix typo
Merge pull request #6091 from BevapDin/target-npcs-2

Allow shooting npcs
Merge pull request #6092 from BevapDin/fix-worn-invlet-bug

Fix worn invlet bug
Merge pull request #6089 from Soyweiser/Dimensional_Phone

Cellphones and talking dolls deconstruction.
Merge pull request #6109 from Rivet-the-Zombie/rail-crossbow-spawn

Rail-mount crossbows didn't actually spawn. This fixes that.
Merge branch 'vehicle-refill' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-vehicle-refill
Merge pull request #6112 from KA101/Sapiovore-expansion

Fix oversight
Merge pull request #6101 from kevingranade/really-fix-map-loading

Really fix map loading
Merge pull request #6107 from BevapDin/no-duplicate-members-in-json

removed/combined multiple members of same name from json
Conflicts:
	data/json/items/melee.json
	data/json/items/tools.json
	data/json/witomod/dojo.json
Merge branch 'minimap-view' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-minimap-view
Merge pull request #6119 from kevingranade/change-warning-handling

Only use Werror and various Wno-stuff on release builds.
Merge pull request #6123 from kevingranade/force-board-unboard

Force board and unboard
merge cleanup
proper string and thread assembly and disassembly