Weapon stuck rework.

Attempt to make weapon sticking make more sense, with a little bugfixing thrown in.