Reenabled caching with GFX tiles
Merge branch 'fix-weight-display' of https://github.com/BevapDin/Cataclysm-DDA into merge3
Merge branch 'unify-note-and-terrain-search' of https://github.com/CleverRaven/Cataclysm-DDA into merge3
Sets peaceful to false when declining

Nice catch, Kevin.
Fixes price of unpurified water.
Merge pull request #9332 from Rivet-the-Zombie/the-stuff-of-life

Fixes price of unpurified water.
The other side of mutagen-marloss interactions

Marloss rejects you if you've already breached.  Mutagens have a very
similar adverse reaction if you've opened the gateway.

BUT they just might be able to close it, too, if that's something you're
wanting.  Use wisely.
Mutation checkups

Locks in the traits.  The Mycus wants you to get them!
added data/credits and data/motd to recursive copy, as install was failing; fixed copy of fontdata.json to DATA_PREFIX
glass matc???? and recipe
added glass trap
just a few more things we can ignore
Applies Parkour and Bad Knees to fence-climbing

Fixes #9334.
fixed issue where tileset loading was only taking place in current directory, even if prefix was specified
glass trap infrastructure
CUT quality and recipe tweak
NON_STUCK flag
check for NULL
added NULL checks to the rest of the pit traps
Dirt floor for craters