Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CDDA-clean
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CDDA-clean
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CDDA-clean
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CDDA-clean
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CDDA-clean
Restyle a big chunk of plmove so I can read it.
Handle turret ammo properly when spawning and despawning, this fully addresses 3982 I think.
Vehicles sometimes start with their engines left on.
savegame, load item: stash invalid itype id string in item_vars. automatically
restore for "null" items if stashed itype becomes valid again. This makes mystery
nulls easier to diagnose, makes the game more sturdy when mods are enabled/disabled
artifact: stop giving artifacts int-as-string itype->id, which results
in garbled invcache entries and artifacts reloading as 'none'. Also make
id string creation automatic in artifact itype constructors
item legacy save load: apply bad itype preservation and anti-itype-autovivication fix
item::tname: only *indicate* if item_vars["item_note"] exists, instead
of *any* item_var
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CDDA-clean
Moved holographic sights to 'sights' slot
Atomic mod item and iuse
atomic battery reloading and modding code
Recipe for atomic battery mod
Add atomic prefix to modded tools
Add weight and volume increase
Merge pull request #5243 from Voker57/holosights

Moved holographic sights to 'sights' slot