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

[argwings]

+1

maybe get rid of passive/active mode too, like said above.