Few derp fixes
Moved weapon logic into an event