Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master

diff --cc qcsrc/client/hud/panel/modicons.qc
Simple merge

diff --cc qcsrc/common/notifications/all.inc
Simple merge

diff --cc qcsrc/common/stats.qh
Simple merge

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

diff --cc qcsrc/server/autocvars.qh
Simple merge

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

diff --cc qcsrc/server/g_world.qc
index 31dd839ca198a77cee3e37f6feb4e8de4ab6d80c,42c64e6a33ece7333b8d557d27aa4a64d47f90bc..a3f2fb32d6c3b853166ab748a1a2afa997aeefdc
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -279,8 -282,8 +282,9 @@@ void cvar_changes_init(
                BADCVAR("g_race_laps_limit");
                BADCVAR("g_race_qualifying_timelimit");
                BADCVAR("g_race_qualifying_timelimit_override");
+               BADCVAR("g_runematch");
                BADCVAR("g_snafu");
 +              BADCVAR("g_surv"); // Lyberta: adding gamemode cvar
                BADCVAR("g_tdm");
                BADCVAR("g_tdm_teams");
                BADCVAR("g_vip");

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