Glass weapon and trap

Address Issue #6454 

Hope I didn't miss anything.
Ah OK, no worries!