Finally finished adding double-toy-swords, emagged double-toy-swords, and improved some of the earlier fixes.  Swords no longer have to be turned off before emagging, the player-sprite overlay will update correctly now.