Convert ammotype from an enum to a std::string to allow more values.
Change ammo type identifiers to lower case.
Prevent dynamic spawning creatures inside houses.
Disable monster spawn generation of non classic monsters in classic zombie mode.
Clear controlling_vehicle flag when dismounting a player from a vehicle.
Auto-drop power-armor components if power armor is removed.
Use player::takeoff() to handle shedding armor due to mutation.
Reduce volume of items dropped by turrets, and ratio of junk parts to ammo.
Fiddled with the popup message for when an NPC gives the player something to avert a segfault.
Added a border to the vehicle menu and centered it.
Merge PR#2046 - Classic monster fix
Merge PR#2054 - Power armor/Mutation interaction
Merge PR#2051 - Vehicle fling fix
Merge PR#2056 - Turret drop nerf
Mrege PR#2038 - Remove inside dynamic spawns
Merge PR#2058 - Fix NPC item give crash
Merge PR#1998 - Ammotype to std::string

Conflicts:
	data/raw/items/ammo.json
	veh_interact.cpp
	vehicle.cpp
Split game::autosave() into two - quicksave() handles the vehicle, movement and item checks (i.e. anything that could potentially lead to problems by saving rapidly or due to bugs) and then handles the saving. autosave() handles the time-delay checks and then calls quicksave()

Removed some copypasta'd autosave() code and replaced it with quicksave().

keymap not updated, I'd recommend 'q' as the quicksave key.
Quick fix to missing popup printf parameters.
Added option to enable/disable zombie revival