Glass weapon and trap

Address Issue #6454 

Hope I didn't miss anything.
Yea, back out all the changes in this file, they're unnecessary.