Move check for ammo effect outside of time_to_fire() to avoid dereferencing (potentially null) currammo.
Merge remote-tracking branch 'origin/pr/2113'
Merge branch 'origin/master'