Merge branch 'martin-t/AMMO' into 'master'
authorMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 04:49:24 +0000 (04:49 +0000)
committerMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 04:49:24 +0000 (04:49 +0000)
Rename misleading const, fix overkill

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

1  2 
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/t_items.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/weapons/weaponsystem.qc
ruleset-overkill.cfg
xonotic-server.cfg

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge