Merge branch 'master' into Lyberta/TeamplayOverhaul

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

diff --cc qcsrc/server/bot/default/bot.qc
Simple merge

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

diff --cc qcsrc/server/command/cmd.qc
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

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

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

diff --cc qcsrc/server/player.qc
index 693a9d29501508282412729f0abd74e7f4824cf9,4d59943b682dfb89a81d68e274100e2b1f1d0a86..03e0bfb64f6d6a80d2977ae34c31bf0bae6624af
--- 1/qcsrc/server/player.qc
--- 2/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@@ -663,60 -664,21 +664,6 @@@ void PlayerDamage(entity this, entity i
        }
  }
  
- /** print(), but only print if the server is not local */
- void dedicated_print(string input)
- {
-       if (server_is_dedicated) print(input);
- }
- 
- void PrintToChat(entity player, string text)
- {
-       text = strcat("\{1}^7", text, "\n");
-       sprint(player, text);
- }
- 
- void DebugPrintToChat(entity player, string text)
- {
-       if (autocvar_developer)
-       {
-               PrintToChat(player, text);
-       }
- }
- 
- void PrintToChatAll(string text)
- {
-       text = strcat("\{1}^7", text, "\n");
-       bprint(text);
- }
- 
- void DebugPrintToChatAll(string text)
- {
-       if (autocvar_developer)
-       {
-               PrintToChatAll(text);
-       }
- }
- 
- void PrintToChatTeam(int teamnum, string text)
- {
-       text = strcat("\{1}^7", text, "\n");
-       FOREACH_CLIENT(IS_REAL_CLIENT(it),
-       {
-               if (it.team == teamnum)
-               {
-                       sprint(it, text);
-               }
-       });
- }
- 
- void DebugPrintToChatTeam(int teamnum, string text)
 -bool MoveToTeam(entity client, int team_colour, int type)
--{
-       if (autocvar_developer)
 -      int lockteams_backup = lockteams;  // backup any team lock
 -      lockteams = 0;  // disable locked teams
 -      TeamchangeFrags(client);  // move the players frags
 -      if (!SetPlayerTeamSimple(client, team_colour))
--      {
-               PrintToChatTeam(teamnum, text);
 -              return false;
--      }
 -      Damage(client, client, client, 100000, DEATH_AUTOTEAMCHANGE.m_id, DMG_NOWEP, client.origin, '0 0 0');  // kill the player
 -      lockteams = lockteams_backup;  // restore the team lock
 -      LogTeamchange(client.playerid, client.team, type);
 -      return true;
--}
--
  /**
   * message "": do not say, just test flood control
   * return value:

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

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