Glass weapon and trap

Address Issue #6454 

Hope I didn't miss anything.
Kevin or BevapDin would know better, but I think we've changed legacy handling entirely and these don't need updated.