No longer asks you to swap your wielded item with the item you're
picking up if it is the same item type
Changed "Drop your X and pick up Y?" to "No space for X; wield it instead? (drops Y)"
Removed 'it' from the message, because the item could be plural
Merge branch 'redundant-pickup-fix' of https://github.com/EpicOrange/Cataclysm-DDA into hp
sdrawkcaB

Fixed a minor reversal issue.  No big.
Merge branch 'hp'