Fixes some misc NODROP stuff I think (don't worry I did actually test)
Makes NODROP items play a bit nicer with pockets.
Merge pull request #2912 from Miauw62/ihavenoideawhati'mdoing

Fixes some misc NODROP stuff I think