in progress
Make poison and magic mushrooms not identifiable by examining without the survival skill.
Some new jewelry.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CDDA-clean
Revert "Chance several zombies color to better differentiate them."

This reverts commit 1514bd13dcb5924d547fe9cf51bd7bc98f165fba.
Revert "Remove crawling zombie's background"

This reverts commit 5943cc4949fd71d099e27ef5387a8034110dbc67.
Oops
Grammar.
Proofed

Cleans up some mutagen double-coding too.
sync trouble

Apparently that didn't save.
Some more adjustments as suggested.
No more encumberment.
spawns, recipe, and tweaking

Should be good to go.
use BORDER_COLOR definition
fix of windows size
Merge pull request #5202 from ianestrachan/harder-mushroom-identify

Special mushrooms no longer trivially identifiable
restore tip about random name plus some other tweaks
Merge bugfixes.
Merge display of materials when examining items.
Prevent monsters (notably hulks) from staggering through walls.