Make ammo saving, and restore same as vanilla
Merge branch 'Development_main' into extDB_beta