Merge remote branch 'origin/master' into samual/updatecommands

diff --combined qcsrc/server/cl_player.qc
index 364404f48321bc9cce8bb8e7ddf2d22131084742,6d7c8b9ac8b42a3c2a54c046c3cd81fe51cf32c5..04ad12c6ef66b0a8685b8e55ef277b0fe19e9c6a
--- 1/qcsrc/server/cl_player.qc
--- 2/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@@ -185,6 -185,7 +185,7 @@@ void CopyBody(float keepvelocity
        if (keepvelocity == 1)
                self.velocity = oldself.velocity;
        self.oldvelocity = self.velocity;
+       self.alpha = oldself.alpha;
        self.fade_time = oldself.fade_time;
        self.fade_rate = oldself.fade_rate;
        //self.weapon = oldself.weapon;
@@@ -948,7 -949,7 +949,7 @@@ float Say(entity source, float teamsay
                                flood = 1;
                }
  
 -              if (timeoutStatus == 2) //when game is paused, no flood protection
 +              if (timeout_status == TIMEOUT_ACTIVE) // when game is paused, no flood protection
                        source.flood_field = flood = 0;
        }