Fix crash on magic trap taming engulfing monster that just expelled hero when other monsters are nearby, i.e. C343-147.
(cherry picked from commit 04d133aa7faceea929c4f05eb1ac741d0817b185)

Conflicts:

	libnethack/src/mon.c
Fix up logic relating to throwing objects at monsters, including fixing a possible crash when throwing breakable objects at monsters.
(cherry picked from commit 34d62c87b289cec2d999eca37b0e19062bf5952f)

Conflicts:

	libnethack/src/dothrow.c
Allow for misspelling 'mind flayer' as 'mindflayer'.

This prevents YASD by a monk typing 'master mindflayer' at the geno prompt,
which is such an egregious perversion of what you tried to do that I think it
stands to be removed.

Fixes some forms of C343-395, regardless of what the DevTeam thinks about its
bugginess.
Merge remote branch 'ais523/nicehack' into nicehack
When trying to go down while blind and levitating, print a more generic message if the player doesn't know what's present at the location (this is another aspect of C343-32 not previously addressed).
(cherry picked from commit 4feb4aa1a50a3289dbdfec198503d64e89241241)

Conflicts:

	libnethack/src/do.c
Change "foreclaw" to "forehoof" in the horse body parts list; fixes C343-77.
(cherry picked from commit 0333ed27591ecbb57f90e7adc6ae8aecfdbaf7a5)

Conflicts:

	libnethack/src/polyself.c
Incorporeal monsters such as ghosts can no longer be slimed (what does the slime stick do if there's not a solid body?). As this includes ghosts, this fixes C343-81.
(cherry picked from commit 53922d0e37b65a3ec7379b65e9d4c7e2ea4c36ce)

Conflicts:

	libnethack/src/eat.c
	libnethack/src/polyself.c
	libnethack/src/uhitm.c
Fix bug wherein thoroughly eroded erodeproof objects could still erode away.
(cherry picked from commit 593c6c787da4d5144cd2fe5ccf30f9059e100557)

Conflicts:

	libnethack/src/trap.c
When enchanting unpaid items, adjust the item's value; when damaging unpaid items, bill for the undamaged object if it's the player's turn, and adjust the item's value otherwise.  Fixes C343-89.
(cherry picked from commit 9f00331a699ed86444330b630cdb508f607014a9)

Conflicts:

	include/extern.h
	libnethack/src/shk.c
	libnethack/src/trap.c
	libnethack/src/wield.c
	src/read.c
Allow monsters killed while on the player's position (steeds and engulfers) to drop corpses. Fixes C343-107.
(cherry picked from commit 6cf949716263ca5bcd7c8405669f34ea49453db4)

Conflicts:

	libnethack/src/mon.c
Make sure to display "You kill [the] poor <pet>\!" when killing your own steed (this didn't always happen because the player couldn't necessarily see their own steed).
(cherry picked from commit c06383524c91513f46a5c6db6ef769d1069c5ed1)

Conflicts:

	libnethack/src/mon.c
In relobj(), call setmnotwielded() if preparing to drop a monster's weapon; this was lost in setmnotwielded() both because the monster was dead. This allows Sunsword to stop glowing properly when its wielder is killed, fixing C343-106.
(cherry picked from commit 5e430da495ea0b3acc724015eb6a36955bb04332)
Allow rubbing anything on a touchstone.

Previously, you could not rub anything other than a gem on an identified
touchstone. Now you can, although the prompt still only suggests gems.

Fixes C343-124 and C343-130.
Give increased worm cut chance to slashing weapons.

Previously, all blades got it and no non-blades did.
Make weapon-tools count as bladed.

This allows pickaxes to engrave and to pry locks. Fixes C343-145.
The stalker is now considered humanoid, and an exception to the elemental rule in mbodypart() is allowed for it such that this is reflected in messages referring to it.  Fixes C343-159.
(cherry picked from commit 1caa11b3b284df97497a47aba391dd60bb92446b)
Shopkeeper now charges the player for containers whose locks are forced in shops. Fixes C343-241.
(cherry picked from commit 7704a8f05c0d87da986e55f6d2ca1ec3c8c45117)

Conflicts:

	libnethack/src/lock.c
Allow large amorphous monsters to ooze through diagonals under the same conditions they can ooze under doors, fixing C343-144.
(cherry picked from commit 892c15613399b9278798aad4319d73f9518de8bf)

Conflicts:

	libnethack/src/hack.c
	libnethack/src/mon.c
Gelatinous cubes attempting to engulf Rider corpses now die. Fixes SC343-16.
(cherry picked from commit 7536ccc1f74dd3b8a5e4bb75ba6da33bc1adf892)
Deal passive damage to nurses using healing attack against polymorphed player; fixes SC343-15.
(cherry picked from commit e44e1cc9e908a7aa0d28ad8b08030408fcc50954)