Cleared the “examine” message in the trade menu correctly
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
Fix for conductivity in items with null second material. Issue #6190
Merge branch 'master' into conductivityfix
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into conductivityfix

Merge conductivity fix with upstream/master
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
Fixes display bug, and crash bug.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into conductivityfix
Keep fix in tune with upstream/master

Need to switch to diff branch
Fixes more than 17 items trading.
Fixes display for min height setting.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
check for being adjacent to a door before attempting to closing it.
Fixes some minor mutation hp inconsistencies.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into conductivityfix
keep in step with upstream master
Minor formatting fix in mutations.json
Merge pull request #6307 from vidarsk/format_json_mutation

Minor formatting fix in mutations.json
Cars runs at perfect cruise control speed instead of bursting above/below it.
Changes size of tank used in pneumatic weapon recipes.

Gas tanks used to be small, then they got big and gained a smaller
cousin, but these recipes were never updated to compensate.
Slightly different method of fixing conductivity issue #6190
Merge branch 'npc_item' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-npc_item