Merge branch 'martin-t/AMMO' into 'master'

Rename misleading const, fix overkill

See merge request xonotic/xonotic-data.pk3dir!692

diff --cc qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
Simple merge

diff --cc qcsrc/common/t_items.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/crylink.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/devastator.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/machinegun.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/shotgun.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge

diff --cc ruleset-overkill.cfg
Simple merge

diff --cc xonotic-server.cfg
Simple merge