Modified player::block_hit() to check and see if asleep. Won't block if that is the case. Issue #6073.
Added check for faucet to allow use. Fixes issue #6241.
Fixed indentation
Fixes silly materials-based sock/shoe check.

Using the power of the SKINTIGHT flag!
Merge branch 'socks-fix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into Rivet-the-Zombie-socks-fix
Extract a magic number to a const.
Truncate item descriptions so they don't overflow into the inventory status display. Fixes #6358.
Removes superfluous EATEN_HOT tag from peanut butter sammiches.
Adds check for active first-aid

Presumes that during active first-aid operations, the PC is applying
pressure or otherwise making some effort not to bleed out.  This won't
affect the status at all, but does stop you from taking bleed damage
whilst in the process of stopping the bleeding.
Merge pull request #6363 from Rivet-the-Zombie/peanut-butter-sammich-fix

Removes superfluous EATEN_HOT tag from peanut butter sammiches.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Deletes unused variable

Guess that warning mattered.
Merge pull request #6365 from KA101/heed-warning

Deletes unused variable
Merge fix preventing additional bleeding during treatment.
Merge pull request #6328 from frycarson/6241FaucetWaterSourceFix

Added check for faucet to allow use. Fixes issue #6241.
Merge fix to sleep blocking.
Update .pot
Re-categorizes some shell casings as 'spare parts' instead of 'ammunition'.
Merge pull request #6367 from Rivet-the-Zombie/casing-categories

Re-categorizes some shell casings as 'spare parts' instead of 'ammunition'.
fix for #6360