[dev1016] Not stopping to draw a weapon and go into "active mode"

[Sephr]

Bump, this needs to get done!

Just made a new thread when this perfectly good one is about, bumping it up.