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
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into npc_item
Fixes display bug, and crash bug.
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
Fixes some minor mutation hp inconsistencies.
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.
Merge branch 'npc_item' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-npc_item
Merge pull request #6315 from Rivet-the-Zombie/tank-fix

Changes size of tank used in pneumatic weapon recipes.
Merge branch 'fix_mutation_hp' of https://github.com/vidarsk/Cataclysm-DDA into vidarsk-fix_mutation_hp
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA