Merge branch 'master' into Mario/lms_updates

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

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

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

diff --cc qcsrc/server/g_damage.qc
index faf21c5bc860c157f91206f46b9f2b11861fdeeb,29eed9af8cf5aecd2d3ebbe65597a86eb711e8ab..cfd5fdc82d086caf9654e04da8e602425452c948
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -197,10 -186,24 +186,6 @@@ void GiveFrags (entity attacker, entit
        else
        {
                self = oldself;
-               if(g_runematch)
 -              if(g_lms)
--              {
-                       f = RunematchHandleFrags(attacker, targ, f);
 -                      // remove a life
 -                      float tl;
 -                      tl = PlayerScore_Add(targ, SP_LMS_LIVES, -1);
 -                      if(tl < lms_lowest_lives)
 -                              lms_lowest_lives = tl;
 -                      if(tl <= 0)
 -                      {
 -                              if(!lms_next_place)
 -                                      lms_next_place = player_count;
 -                              else
 -                                      lms_next_place = min(lms_next_place, player_count);
 -                              PlayerScore_Add(targ, SP_LMS_RANK, lms_next_place); // won't ever spawn again
 -                              --lms_next_place;
 -                      }
 -                      f = 0;
--              }
        }
  
        attacker.totalfrags += f;

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

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

diff --cc qcsrc/server/mutators/base.qh
Simple merge

diff --cc qcsrc/server/progs.src
Simple merge

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

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

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