Revert "Add a missing #ifdef for gas traps."

This reverts commit 10cd9e452220ebeadc7217a0637fb7eb227568a5.
Revert "Don't refer to sickness from food (ogaz)."

This reverts commit 2210f324924fa7c97c3935f3d7a0e4dddfe24580.
Reinstate fruity bat tiles
Revert "Remove Pan."

This reverts commit 3c279cd41edeaa047237d76bc47c2daa1229b78a.
Revert "Offer rotten chunks first to those who can eat them."

This reverts commit bb2be8b47de3a906c3f5c503b92f44b37029faef.
Revert "Remove some obsolete food-related options"

This reverts commit 9d29fcb8fd9b6aaf9e7ca8ebbb1c3cd0c478568c.
Revert "Identify scrolls of amnesia if read with no spells memorised"

This reverts commit 97dada43bd2e1e76f2b6a5263bbd04a3d44c2bc1.
Revert "Speed 10 for jellies (was: 9)"

This reverts commit 8dc47299d43ea3bb3a1f4f60ecd8d88ec69113a3.
Revert "Purge all of Pan from our midst"

This reverts commit 654be61b151955a3ea63375b9f7bcba796362db9.
Revert "Remove deep dwarf scions, artificers and necromancers"

This reverts commit f61ad0bcab060bc8018e8effe1bcd02ef641b45a.

Conflicts:
	crawl-ref/source/dat/des/branches/crypt.des
	crawl-ref/source/mon-gear.cc
	crawl-ref/source/tilemcache.cc
Revert "Don't generate scythes of reaping"

This reverts commit d93e8f602c464ae165c44072867787cc940153f8.
Revert "Do not generate hammers unless defined in a vault"

This reverts commit 92a6f35f339cb52a0fd7ec4ad2014142fb80e110.
Revert "Remove a 402 years old fart joke."

This reverts commit 772cbec2479d6b59ccb91cad149c7edf8968cf6f.
Revert "Replace Elf:3- with Elf:$"

This reverts commit aa0373c70c85b577dfafc581e8fa74aec05097ec.
Revert "Remove gas traps."

This reverts commit 6143d70c89864a3849010fd330e4ee22e4618c5d.
Revert "Remove a Dwarf reference from Zigsprint."

This reverts commit 3d5b449c0f042e5255238e57e316f7de34eab284.
Restore Dwarven Hall and misc monster descriptions

These descriptions are for things that were removed upstream but not in
dcss-ehe.

This partially reverts commit 2cb6485c0136d4b8185bc3271180cf24c55ebd48.
Revert "Remove a claim that Heroism improves your skill with traps."

This reverts commit b55b161e8cbe7ca2a7468dcb210282ada9ae6dd8.
Revert "Don't let --mapstat try to build Dwarf maps."

This reverts commit 19e1bf6eebfe1604a0dbeaab3975128e19543ee6.
Revert "Add a compat lua callback for removed cloud traps."

This reverts commit f2498f4b3bcf8f0cb01b18d8b19546492a0afc04.