Merge branch 'master' into Mario/mutator_minstagib

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

diff --cc qcsrc/server/cl_client.qc
index a2ee7ece342a143758f54fb732510cb8b203943e,4c7d5c57564d8f7b674c610629e45faac08ab7b7..671771bcb37e580f6e77780ce36123e1f1d95763
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -401,9 -401,10 +401,8 @@@ void PutObserverInServer (void
                WriteEntity(MSG_ONE, self);
        }
  
-       DropAllRunes(self);
        MUTATOR_CALLHOOK(MakePlayerObserver);
  
 -      minstagib_stop_countdown(self);
 -
        Portal_ClearAll(self);
        
        if(self.alivetime)

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

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

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

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

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/teamplay.qc
Simple merge