(f0d812055) v0.9.9.0

2020-04-23 19:19:37 +03:00
parent b647059b93
commit ac37a3b0e4
391 changed files with 15054 additions and 5420 deletions
@@ -347,7 +347,7 @@ namespace Barotrauma.Networking
                    BannedPlayer bannedPlayer = bannedPlayers.Find(p => p.UniqueIdentifier == id);
                    if (bannedPlayer != null)
                    {
-                        GameServer.Log(c.Name + " unbanned " + bannedPlayer.Name + " (" + bannedPlayer.IP + ")", ServerLog.MessageType.ConsoleUsage);
+                        GameServer.Log(GameServer.ClientLogName(c) + " unbanned " + bannedPlayer.Name + " (" + bannedPlayer.IP + ")", ServerLog.MessageType.ConsoleUsage);
                        RemoveBan(bannedPlayer);
                    }
                }
@@ -358,7 +358,7 @@ namespace Barotrauma.Networking
                    BannedPlayer bannedPlayer = bannedPlayers.Find(p => p.UniqueIdentifier == id);
                    if (bannedPlayer != null)
                    {
-                        GameServer.Log(c.Name + " rangebanned " + bannedPlayer.Name + " (" + bannedPlayer.IP + ")", ServerLog.MessageType.ConsoleUsage);
+                        GameServer.Log(GameServer.ClientLogName(c) + " rangebanned " + bannedPlayer.Name + " (" + bannedPlayer.IP + ")", ServerLog.MessageType.ConsoleUsage);
                        RangeBan(bannedPlayer);
                    }
                }
@@ -159,6 +159,7 @@ namespace Barotrauma.Networking
            msg.Write((byte)ServerNetObject.CHAT_MESSAGE);
            msg.Write(NetStateID);
            msg.Write((byte)Type);
+            msg.Write((byte)ChangeType);
            msg.Write(Text);

            msg.Write(SenderName);
@@ -75,7 +75,8 @@ namespace Barotrauma.Networking
        public bool SpectateOnly;

        public int KarmaKickCount;
-        
+
+        private float syncedKarma = 100.0f;
        private float karma = 100.0f;
        public float Karma
        {
@@ -89,6 +90,11 @@ namespace Barotrauma.Networking
            {
                if (GameMain.Server == null || !GameMain.Server.ServerSettings.KarmaEnabled) { return; }
                karma = Math.Min(Math.Max(value, 0.0f), 100.0f);
+                if (!MathUtils.NearlyEqual(karma, syncedKarma, 10.0f))
+                {
+                    syncedKarma = karma;
+                    GameMain.NetworkMember.LastClientListUpdateID++;
+                }
            }
        }

@@ -35,7 +35,7 @@ namespace Barotrauma
                {
                    message.Write((byte)SpawnableType.Item);
                    DebugConsole.Log("Writing item spawn data " + entities.Entity.ToString() + " (original ID: " + entities.OriginalID + ", current ID: " + entities.Entity.ID + ")");
-                    ((Item)entities.Entity).WriteSpawnData(message, entities.OriginalID);
+                    ((Item)entities.Entity).WriteSpawnData(message, entities.OriginalID, entities.OriginalInventoryID);
                }
                else if (entities.Entity is Character)
                {
@@ -332,7 +332,7 @@ namespace Barotrauma.Networking
                case (byte)FileTransferType.Submarine:
                    string fileName = inc.ReadString();
                    string fileHash = inc.ReadString();
-                    var requestedSubmarine = Submarine.SavedSubmarines.FirstOrDefault(s => s.Name == fileName && s.MD5Hash.Hash == fileHash);
+                    var requestedSubmarine = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == fileName && s.MD5Hash.Hash == fileHash);

                    if (requestedSubmarine != null)
                    {
@@ -205,12 +205,12 @@ namespace Barotrauma.Networking
            GameMain.NetLobbyScreen.RandomizeSettings();
            if (!string.IsNullOrEmpty(serverSettings.SelectedSubmarine)) 
            {
-                Submarine sub = Submarine.SavedSubmarines.FirstOrDefault(s => s.Name == serverSettings.SelectedSubmarine);
+                SubmarineInfo sub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == serverSettings.SelectedSubmarine);
                if (sub != null) { GameMain.NetLobbyScreen.SelectedSub = sub; }
            }
            if (!string.IsNullOrEmpty(serverSettings.SelectedShuttle))
            {
-                Submarine shuttle = Submarine.SavedSubmarines.FirstOrDefault(s => s.Name == serverSettings.SelectedShuttle);
+                SubmarineInfo shuttle = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == serverSettings.SelectedShuttle);
                if (shuttle != null) { GameMain.NetLobbyScreen.SelectedShuttle = shuttle; }
            }
            started = true;
@@ -279,7 +279,7 @@ namespace Barotrauma.Networking
                SendConsoleMessage("Granted all permissions to " + newClient.Name + ".", newClient);
            }

-            SendChatMessage($"ServerMessage.JoinedServer~[client]={clName}", ChatMessageType.Server, null);
+            SendChatMessage($"ServerMessage.JoinedServer~[client]={clName}", ChatMessageType.Server, null, changeType: PlayerConnectionChangeType.Joined);
            serverSettings.ServerDetailsChanged = true;

            if (previousPlayer != null && previousPlayer.Name != newClient.Name)
@@ -338,6 +338,8 @@ namespace Barotrauma.Networking
            fileSender.Update(deltaTime);
            KarmaManager.UpdateClients(ConnectedClients, deltaTime);

+            UpdatePing();
+
            if (serverSettings.VoiceChatEnabled)
            {
                VoipServer.SendToClients(connectedClients);
@@ -382,7 +384,7 @@ namespace Barotrauma.Networking
                }

                bool isCrewDead =
-                    connectedClients.All(c => c.Character == null || c.Character.IsDead || c.Character.IsUnconscious);
+                    connectedClients.All(c => c.Character == null || c.Character.IsDead || c.Character.IsIncapacitated);

                bool subAtLevelEnd = false;
                if (Submarine.MainSub != null && Submarine.MainSubs[1] == null)
@@ -529,7 +531,7 @@ namespace Barotrauma.Networking
                c.ChatSpamSpeed = Math.Max(0.0f, c.ChatSpamSpeed - deltaTime);

                //constantly increase AFK timer if the client is controlling a character (gets reset to zero every time an input is received)
-                if (gameStarted && c.Character != null && !c.Character.IsDead && !c.Character.IsUnconscious)
+                if (gameStarted && c.Character != null && !c.Character.IsDead && !c.Character.IsIncapacitated)
                {
                    if (c.Connection != OwnerConnection) c.KickAFKTimer += deltaTime;
                }
@@ -611,6 +613,41 @@ namespace Barotrauma.Networking
            }
        }

+
+        private double lastPingTime;
+        private byte[] lastPingData;
+        private void UpdatePing()
+        {
+            if (Timing.TotalTime > lastPingTime + 1.0)
+            {
+                lastPingData ??= new byte[64];
+                for (int i=0;i<lastPingData.Length;i++)
+                {
+                    lastPingData[i] = (byte)Rand.Range(33, 126);
+                }
+                lastPingTime = Timing.TotalTime;
+
+                ConnectedClients.ForEach(c =>
+                {
+                    IWriteMessage pingReq = new WriteOnlyMessage();
+                    pingReq.Write((byte)ServerPacketHeader.PING_REQUEST);
+                    pingReq.Write((byte)lastPingData.Length);
+                    pingReq.Write(lastPingData, 0, lastPingData.Length);
+                    serverPeer.Send(pingReq, c.Connection, DeliveryMethod.Unreliable);
+
+                    IWriteMessage pingInf = new WriteOnlyMessage();
+                    pingInf.Write((byte)ServerPacketHeader.CLIENT_PINGS);
+                    pingInf.Write((byte)ConnectedClients.Count);
+                    ConnectedClients.ForEach(c2 =>
+                    {
+                        pingInf.Write(c2.ID);
+                        pingInf.Write(c2.Ping);
+                    });
+                    serverPeer.Send(pingInf, c.Connection, DeliveryMethod.Unreliable);
+                });
+            }
+        }
+
        private void ReadDataMessage(NetworkConnection sender, IReadMessage inc)
        {
            var connectedClient = connectedClients.Find(c => c.Connection == sender);
@@ -618,6 +655,16 @@ namespace Barotrauma.Networking
            ClientPacketHeader header = (ClientPacketHeader)inc.ReadByte();
            switch (header)
            {
+                case ClientPacketHeader.PING_RESPONSE:
+                    byte responseLen = inc.ReadByte();
+                    if (responseLen != lastPingData.Length) { return; }
+                    for (int i=0;i<responseLen;i++)
+                    {
+                        byte b = inc.ReadByte();
+                        if (b != lastPingData[i]) { return; }
+                    }
+                    connectedClient.Ping = (UInt16)((Timing.TotalTime - lastPingTime) * 1000);
+                    break;
                case ClientPacketHeader.RESPONSE_STARTGAME:
                    if (connectedClient != null)
                    {
@@ -653,7 +700,7 @@ namespace Barotrauma.Networking
                        string subName = inc.ReadString();
                        string subHash = inc.ReadString();

-                        var matchingSub = Submarine.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.Hash == subHash);
+                        var matchingSub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.Hash == subHash);

                        if (matchingSub == null)
                        {
@@ -748,11 +795,11 @@ namespace Barotrauma.Networking
            if (Level.Loaded != null && levelEqualityCheckVal != Level.Loaded.EqualityCheckVal)
            {
                errorStr += " Level equality check failed. The level generated at your end doesn't match the level generated by the server(seed: " + Level.Loaded.Seed +
-                    ", sub: " + Submarine.MainSub.Name + " (" + Submarine.MainSub.MD5Hash.ShortHash + ")" +
+                    ", sub: " + Submarine.MainSub.Info.Name + " (" + Submarine.MainSub.Info.MD5Hash.ShortHash + ")" +
                    ", mirrored: " + Level.Loaded.Mirrored + ").";
            }

-            Log(c.Name + " has reported an error: " + errorStr, ServerLog.MessageType.Error);
+            Log(GameServer.ClientLogName(c) + " has reported an error: " + errorStr, ServerLog.MessageType.Error);
            GameAnalyticsManager.AddErrorEventOnce("GameServer.HandleClientError:" + errorStr, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorStr);

            try
@@ -783,8 +830,8 @@ namespace Barotrauma.Networking
                Directory.CreateDirectory(ServerLog.SavePath);
            }

-            string filePath = "event_error_log_server_" + client.Name + "_" + ToolBox.RemoveInvalidFileNameChars(DateTime.UtcNow.ToShortTimeString() + ".log");
-            filePath = Path.Combine(ServerLog.SavePath, filePath);
+            string filePath = "event_error_log_server_" + client.Name + "_" + DateTime.UtcNow.ToShortTimeString() + ".log";
+            filePath = Path.Combine(ServerLog.SavePath, ToolBox.RemoveInvalidFileNameChars(filePath));
            if (File.Exists(filePath)) { return; }

            List<string> errorLines = new List<string>
@@ -798,7 +845,7 @@ namespace Barotrauma.Networking
            }
            if (GameMain.GameSession?.Submarine != null)
            {
-                errorLines.Add("Submarine: " + GameMain.GameSession.Submarine.Name);
+                errorLines.Add("Submarine: " + GameMain.GameSession.Submarine.Info.Name);
            }
            if (Level.Loaded != null)
            {
@@ -1068,7 +1115,7 @@ namespace Barotrauma.Networking
            }
            else if (!sender.HasPermission(command))
            {
-                Log("Client \"" + sender.Name + "\" sent a server command \"" + command + "\". Permission denied.", ServerLog.MessageType.ServerMessage);
+                Log("Client \"" + GameServer.ClientLogName(sender) + "\" sent a server command \"" + command + "\". Permission denied.", ServerLog.MessageType.ServerMessage);
                return;
            }

@@ -1077,10 +1124,10 @@ namespace Barotrauma.Networking
                case ClientPermissions.Kick:
                    string kickedName = inc.ReadString().ToLowerInvariant();
                    string kickReason = inc.ReadString();
-                    var kickedClient = connectedClients.Find(cl => cl != sender && cl.Name.ToLowerInvariant() == kickedName && cl.Connection != OwnerConnection);
+                    var kickedClient = connectedClients.Find(cl => cl != sender && cl.Name.Equals(kickedName, StringComparison.OrdinalIgnoreCase) && cl.Connection != OwnerConnection);
                    if (kickedClient != null)
                    {
-                        Log("Client \"" + sender.Name + "\" kicked \"" + kickedClient.Name + "\".", ServerLog.MessageType.ServerMessage);
+                        Log("Client \"" + GameServer.ClientLogName(sender) + "\" kicked \"" + GameServer.ClientLogName(kickedClient) + "\".", ServerLog.MessageType.ServerMessage);
                        KickClient(kickedClient, string.IsNullOrEmpty(kickReason) ? $"ServerMessage.KickedBy~[initiator]={sender.Name}" : kickReason);
                    }
                    else
@@ -1094,10 +1141,10 @@ namespace Barotrauma.Networking
                    bool range = inc.ReadBoolean();
                    double durationSeconds = inc.ReadDouble();

-                    var bannedClient = connectedClients.Find(cl => cl != sender && cl.Name.ToLowerInvariant() == bannedName && cl.Connection != OwnerConnection);
+                    var bannedClient = connectedClients.Find(cl => cl != sender && cl.Name.Equals(bannedName, StringComparison.OrdinalIgnoreCase) && cl.Connection != OwnerConnection);
                    if (bannedClient != null)
                    {
-                        Log("Client \"" + sender.Name + "\" banned \"" + bannedClient.Name + "\".", ServerLog.MessageType.ServerMessage);
+                        Log("Client \"" + GameServer.ClientLogName(sender) + "\" banned \"" + GameServer.ClientLogName(bannedClient) + "\".", ServerLog.MessageType.ServerMessage);
                        if (durationSeconds > 0)
                        {
                            BanClient(bannedClient, string.IsNullOrEmpty(banReason) ? $"ServerMessage.BannedBy~[initiator]={sender.Name}" : banReason, range, TimeSpan.FromSeconds(durationSeconds));
@@ -1121,12 +1168,12 @@ namespace Barotrauma.Networking
                    bool end = inc.ReadBoolean();
                    if (gameStarted && end)
                    {
-                        Log("Client \"" + sender.Name + "\" ended the round.", ServerLog.MessageType.ServerMessage);
+                        Log("Client \"" + GameServer.ClientLogName(sender) + "\" ended the round.", ServerLog.MessageType.ServerMessage);
                        EndGame();
                    }
                    else if (!gameStarted && !end && !initiatedStartGame)
                    {
-                        Log("Client \"" + sender.Name + "\" started the round.", ServerLog.MessageType.ServerMessage);
+                        Log("Client \"" + GameServer.ClientLogName(sender) + "\" started the round.", ServerLog.MessageType.ServerMessage);
                        StartGame();
                    }
                    break;
@@ -1137,7 +1184,7 @@ namespace Barotrauma.Networking
                    var subList = GameMain.NetLobbyScreen.GetSubList();
                    if (subIndex >= subList.Count)
                    {
-                        DebugConsole.NewMessage("Client \"" + sender.Name + "\" attempted to select a sub, index out of bounds (" + subIndex + ")", Color.Red);
+                        DebugConsole.NewMessage("Client \"" + GameServer.ClientLogName(sender) + "\" attempted to select a sub, index out of bounds (" + subIndex + ")", Color.Red);
                    }
                    else
                    {
@@ -1153,7 +1200,7 @@ namespace Barotrauma.Networking
                    break;
                case ClientPermissions.SelectMode:
                    UInt16 modeIndex = inc.ReadUInt16();
-                    if (GameMain.NetLobbyScreen.GameModes[modeIndex].Identifier.ToLowerInvariant() == "multiplayercampaign")
+                    if (GameMain.NetLobbyScreen.GameModes[modeIndex].Identifier.Equals("multiplayercampaign", StringComparison.OrdinalIgnoreCase))
                    {
                        string[] saveFiles = SaveUtil.GetSaveFiles(SaveUtil.SaveType.Multiplayer).ToArray();
                        for (int i = 0; i < saveFiles.Length; i++)
@@ -1220,12 +1267,12 @@ namespace Barotrauma.Networking
                    string logMsg;
                    if (permissionNames.Any())
                    {
-                        logMsg = "Client \"" + sender.Name + "\" set the permissions of the client \"" + targetClient.Name + "\" to "
+                        logMsg = "Client \"" + GameServer.ClientLogName(sender) + "\" set the permissions of the client \"" + GameServer.ClientLogName(targetClient) + "\" to "
                            + string.Join(", ", permissionNames);
                    }
                    else
                    {
-                        logMsg = "Client \"" + sender.Name + "\" removed all permissions from the client \"" + targetClient.Name + ".";
+                        logMsg = "Client \"" + GameServer.ClientLogName(sender) + "\" removed all permissions from the client \"" + GameServer.ClientLogName(targetClient) + ".";
                    }
                    Log(logMsg, ServerLog.MessageType.ServerMessage);

@@ -1342,7 +1389,7 @@ namespace Barotrauma.Networking
                {
                    //if docked to a sub with a smaller ID, don't send an update
                    //  (= update is only sent for the docked sub that has the smallest ID, doesn't matter if it's the main sub or a shuttle)
-                    if (sub.IsOutpost || sub.DockedTo.Any(s => s.ID < sub.ID)) continue;
+                    if (sub.Info.IsOutpost || sub.DockedTo.Any(s => s.ID < sub.ID)) continue;
                    if (!c.PendingPositionUpdates.Contains(sub)) c.PendingPositionUpdates.Enqueue(sub);
                }

@@ -1484,9 +1531,21 @@ namespace Barotrauma.Networking
                outmsg.Write(client.Name);
                outmsg.Write(client.Character == null || !gameStarted ? (client.PreferredJob ?? "") : "");
                outmsg.Write(client.Character == null || !gameStarted ? (ushort)0 : client.Character.ID);
+                if (c.HasPermission(ClientPermissions.ServerLog))
+                {
+                    outmsg.Write(client.Karma);
+                }
+                else
+                {
+                    outmsg.Write(100.0f);
+                }
                outmsg.Write(client.Muted);
                outmsg.Write(client.InGame);
-                outmsg.Write(client.Connection != OwnerConnection); //is kicking the player allowed
+                outmsg.Write(client.Permissions != ClientPermissions.None);
+                outmsg.Write(client.Connection != OwnerConnection && 
+                    !client.HasPermission(ClientPermissions.Ban) &&
+                    !client.HasPermission(ClientPermissions.Kick) &&
+                    !client.HasPermission(ClientPermissions.Unban)); //is kicking the player allowed
                outmsg.WritePadBits();
            }
        }
@@ -1655,12 +1714,12 @@ namespace Barotrauma.Networking

            Log("Starting a new round...", ServerLog.MessageType.ServerMessage);

-            Submarine selectedSub = null;
-            Submarine selectedShuttle = GameMain.NetLobbyScreen.SelectedShuttle;
+            SubmarineInfo selectedSub = null;
+            SubmarineInfo selectedShuttle = GameMain.NetLobbyScreen.SelectedShuttle;

            if (serverSettings.Voting.AllowSubVoting)
            {
-                selectedSub = serverSettings.Voting.HighestVoted<Submarine>(VoteType.Sub, connectedClients);
+                selectedSub = serverSettings.Voting.HighestVoted<SubmarineInfo>(VoteType.Sub, connectedClients);
                if (selectedSub == null) selectedSub = GameMain.NetLobbyScreen.SelectedSub;
            }
            else
@@ -1692,7 +1751,7 @@ namespace Barotrauma.Networking
            return true;
        }

-        private IEnumerable<object> InitiateStartGame(Submarine selectedSub, Submarine selectedShuttle, bool usingShuttle, GameModePreset selectedMode)
+        private IEnumerable<object> InitiateStartGame(SubmarineInfo selectedSub, SubmarineInfo selectedShuttle, bool usingShuttle, GameModePreset selectedMode)
        {
            initiatedStartGame = true;

@@ -1740,7 +1799,7 @@ namespace Barotrauma.Networking
            yield return CoroutineStatus.Success;
        }

-        private IEnumerable<object> StartGame(Submarine selectedSub, Submarine selectedShuttle, bool usingShuttle, GameModePreset selectedMode)
+        private IEnumerable<object> StartGame(SubmarineInfo selectedSub, SubmarineInfo selectedShuttle, bool usingShuttle, GameModePreset selectedMode)
        {
            entityEventManager.Clear();

@@ -1805,12 +1864,11 @@ namespace Barotrauma.Networking
                SendStartMessage(roundStartSeed, campaign.Map.SelectedConnection.Level.Seed, GameMain.GameSession, connectedClients, false);

                GameMain.GameSession.StartRound(campaign.Map.SelectedConnection.Level,
-                    reloadSub: true,
                    mirrorLevel: campaign.Map.CurrentLocation != campaign.Map.SelectedConnection.Locations[0]);

                campaign.AssignClientCharacterInfos(connectedClients);
                Log("Game mode: " + selectedMode.Name, ServerLog.MessageType.ServerMessage);
-                Log("Submarine: " + GameMain.GameSession.Submarine.Name, ServerLog.MessageType.ServerMessage);
+                Log("Submarine: " + GameMain.GameSession.SubmarineInfo.Name, ServerLog.MessageType.ServerMessage);
                Log("Level seed: " + campaign.Map.SelectedConnection.Level.Seed, ServerLog.MessageType.ServerMessage);
            }
            else
@@ -1823,11 +1881,11 @@ namespace Barotrauma.Networking
                Log("Level seed: " + GameMain.NetLobbyScreen.LevelSeed, ServerLog.MessageType.ServerMessage);
            }

-            if (GameMain.GameSession.Submarine.IsFileCorrupted)
+            if (GameMain.GameSession.SubmarineInfo.IsFileCorrupted)
            {
                CoroutineManager.StopCoroutines(startGameCoroutine);
                initiatedStartGame = false;
-                SendChatMessage(TextManager.FormatServerMessage($"SubLoadError~[subname]={GameMain.GameSession.Submarine.Name}"), ChatMessageType.Error);
+                SendChatMessage(TextManager.FormatServerMessage($"SubLoadError~[subname]={GameMain.GameSession.SubmarineInfo.Name}"), ChatMessageType.Error);
                yield return CoroutineStatus.Failure;
            }

@@ -1836,6 +1894,7 @@ namespace Barotrauma.Networking

            if (serverSettings.AllowRespawn && missionAllowRespawn) { respawnManager = new RespawnManager(this, usingShuttle ? selectedShuttle : null); }

+            Level.Loaded?.SpawnCorpses();
            AutoItemPlacer.PlaceIfNeeded(GameMain.GameSession.GameMode);

            entityEventManager.RefreshEntityIDs();
@@ -1993,8 +2052,8 @@ namespace Barotrauma.Networking

            msg.Write((byte)GameMain.NetLobbyScreen.MissionType);

-            msg.Write(gameSession.Submarine.Name);
-            msg.Write(gameSession.Submarine.MD5Hash.Hash);
+            msg.Write(gameSession.SubmarineInfo.Name);
+            msg.Write(gameSession.SubmarineInfo.MD5Hash.Hash);
            msg.Write(serverSettings.UseRespawnShuttle);
            msg.Write(GameMain.NetLobbyScreen.SelectedShuttle.Name);
            msg.Write(GameMain.NetLobbyScreen.SelectedShuttle.MD5Hash.Hash);
@@ -2139,7 +2198,16 @@ namespace Barotrauma.Networking
        public override void AddChatMessage(ChatMessage message)
        {
            if (string.IsNullOrEmpty(message.Text)) { return; }
-            Log(message.TextWithSender, ServerLog.MessageType.Chat);
+            string logMsg;
+            if (message.SenderClient != null)
+            {
+                logMsg = GameServer.ClientLogName(message.SenderClient) + ": " + message.TranslatedText;
+            }
+            else
+            {
+                logMsg = message.TextWithSender;
+            }
+            Log(logMsg, ServerLog.MessageType.Chat);

            base.AddChatMessage(message);
        }
@@ -2192,11 +2260,9 @@ namespace Barotrauma.Networking

        public override void KickPlayer(string playerName, string reason)
        {
-            playerName = playerName.ToLowerInvariant();
-
            Client client = connectedClients.Find(c =>
-                c.Name.ToLowerInvariant() == playerName ||
-                (c.Character != null && c.Character.Name.ToLowerInvariant() == playerName));
+                c.Name.Equals(playerName, StringComparison.OrdinalIgnoreCase) ||
+                (c.Character != null && c.Character.Name.Equals(playerName, StringComparison.OrdinalIgnoreCase)));

            KickClient(client, reason);
        }
@@ -2225,16 +2291,14 @@ namespace Barotrauma.Networking

            string msg = DisconnectReason.Kicked.ToString();
            string logMsg = $"ServerMessage.KickedFromServer~[client]={client.Name}";
-            DisconnectClient(client, logMsg, msg, reason);
+            DisconnectClient(client, logMsg, msg, reason, PlayerConnectionChangeType.Kicked);
        }

        public override void BanPlayer(string playerName, string reason, bool range = false, TimeSpan? duration = null)
        {
-            playerName = playerName.ToLowerInvariant();
-
            Client client = connectedClients.Find(c =>
-                c.Name.ToLowerInvariant() == playerName ||
-                (c.Character != null && c.Character.Name.ToLowerInvariant() == playerName));
+                c.Name.Equals(playerName, StringComparison.OrdinalIgnoreCase) ||
+                (c.Character != null && c.Character.Name.Equals(playerName, StringComparison.OrdinalIgnoreCase)));

            if (client == null)
            {
@@ -2258,7 +2322,7 @@ namespace Barotrauma.Networking
            client.Karma = Math.Max(client.Karma, 50.0f);

            string targetMsg = DisconnectReason.Banned.ToString();
-            DisconnectClient(client, $"ServerMessage.BannedFromServer~[client]={client.Name}", targetMsg, reason);
+            DisconnectClient(client, $"ServerMessage.BannedFromServer~[client]={client.Name}", targetMsg, reason, PlayerConnectionChangeType.Banned);

            if (client.SteamID == 0 || range)
            {
@@ -2302,10 +2366,10 @@ namespace Barotrauma.Networking
            Client client = connectedClients.Find(x => x.Connection == senderConnection);
            if (client == null) return;

-            DisconnectClient(client, msg, targetmsg, string.Empty);
+            DisconnectClient(client, msg, targetmsg, string.Empty, PlayerConnectionChangeType.Disconnected);
        }

-        public void DisconnectClient(Client client, string msg = "", string targetmsg = "", string reason = "")
+        public void DisconnectClient(Client client, string msg = "", string targetmsg = "", string reason = "", PlayerConnectionChangeType changeType = PlayerConnectionChangeType.Disconnected)
        {
            if (client == null) return;

@@ -2352,7 +2416,7 @@ namespace Barotrauma.Networking

            UpdateVoteStatus();

-            SendChatMessage(msg, ChatMessageType.Server);
+            SendChatMessage(msg, ChatMessageType.Server, changeType: changeType);

            UpdateCrewFrame();

@@ -2401,7 +2465,7 @@ namespace Barotrauma.Networking
        /// <summary>
        /// Add the message to the chatbox and pass it to all clients who can receive it
        /// </summary>
-        public void SendChatMessage(string message, ChatMessageType? type = null, Client senderClient = null, Character senderCharacter = null)
+        public void SendChatMessage(string message, ChatMessageType? type = null, Client senderClient = null, Character senderCharacter = null, PlayerConnectionChangeType changeType = PlayerConnectionChangeType.None)
        {
            string senderName = "";

@@ -2486,17 +2550,20 @@ namespace Barotrauma.Networking
                    senderCharacter = senderClient.Character;
                    senderName = senderCharacter == null ? senderClient.Name : senderCharacter.Name;

+                    if (type == ChatMessageType.Private)
+                    {
+                        if (senderCharacter != null && !senderCharacter.IsDead || targetClient.Character != null && !targetClient.Character.IsDead)
+                        {
+                            //sender or target has an alive character, sending private messages not allowed
+                            SendDirectChatMessage(ChatMessage.Create("", $"ServerMessage.PrivateMessagesNotAllowed", ChatMessageType.Error, null), senderClient);
+                            return;
+                        }
+                    }
                    //sender doesn't have a character or the character can't speak -> only ChatMessageType.Dead allowed
-                    if (senderCharacter == null || senderCharacter.IsDead || senderCharacter.SpeechImpediment >= 100.0f)
+                    else if (senderCharacter == null || senderCharacter.IsDead || senderCharacter.SpeechImpediment >= 100.0f)
                    {
                        type = ChatMessageType.Dead;
                    }
-                    else if (type == ChatMessageType.Private)
-                    {
-                        //sender has an alive character, sending private messages not allowed
-                        return;
-                    }
-
                }
            }
            else
@@ -2592,7 +2659,9 @@ namespace Barotrauma.Networking
                    senderName,
                    modifiedMessage,
                    (ChatMessageType)type,
-                    senderCharacter);
+                    senderCharacter,
+                    senderClient, 
+                    changeType);

                SendDirectChatMessage(chatMsg, client);
            }
@@ -2663,6 +2732,9 @@ namespace Barotrauma.Networking

            var clientsToKick = connectedClients.FindAll(c =>
                c.Connection != OwnerConnection &&
+                !c.HasPermission(ClientPermissions.Kick) &&
+                !c.HasPermission(ClientPermissions.Ban) &&
+                !c.HasPermission(ClientPermissions.Unban) &&
                c.KickVoteCount >= connectedClients.Count * serverSettings.KickVoteRequiredRatio);
            foreach (Client c in clientsToKick)
            {
@@ -2673,7 +2745,7 @@ namespace Barotrauma.Networking
                    previousPlayer.KickVoters.Clear();
                }

-                SendChatMessage($"ServerMessage.KickedFromServer~[client]={c.Name}", ChatMessageType.Server, null);
+                SendChatMessage($"ServerMessage.KickedFromServer~[client]={c.Name}", ChatMessageType.Server, null, changeType: PlayerConnectionChangeType.Kicked);
                KickClient(c, "ServerMessage.KickedByVote");
                BanClient(c, "ServerMessage.KickedByVoteAutoBan", duration: TimeSpan.FromSeconds(serverSettings.AutoBanTime));
            }
@@ -2857,6 +2929,11 @@ namespace Barotrauma.Networking
                {
                    newCharacter.LastNetworkUpdateID = client.Character.LastNetworkUpdateID;
                }
+                
+                if (newCharacter.Info != null && newCharacter.Info.Character == null)
+                {
+                    newCharacter.Info.Character = newCharacter;
+                }

                newCharacter.OwnerClientEndPoint = client.Connection.EndPointString;
                newCharacter.OwnerClientName = client.Name;
@@ -3203,6 +3280,25 @@ namespace Barotrauma.Networking
            }
        }

+        public static string ClientLogName(Client client, string name = null)
+        {
+            if (client == null) { return name; }
+            string retVal = "‖";
+            if (client.Karma < 40.0f)
+            {
+                retVal += "color:#ff9900;";
+            }
+            retVal += "metadata:" + (client.SteamID!=0 ? client.SteamID.ToString() : client.ID.ToString()) + "‖" + (name ?? client.Name) + "‖end‖";
+            return retVal;
+        }
+
+        public static string CharacterLogName(Character character)
+        {
+            if (character == null) { return "[NULL]"; }
+            Client client = GameMain.Server.ConnectedClients.Find(c => c.Character == character);
+            return ClientLogName(client, character.LogName);
+        }
+
        public static void Log(string line, ServerLog.MessageType messageType)
        {
            if (GameMain.Server == null || !GameMain.Server.ServerSettings.SaveServerLogs) return;
@@ -3,6 +3,7 @@ using Barotrauma.Networking;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -12,8 +13,18 @@ namespace Barotrauma
        {
            public List<Pair<Wire, float>> WireDisconnectTime = new List<Pair<Wire, float>>();

+            public struct TimeAmount
+            {
+                public double Time;
+                public float Amount;
+            }
+
+            public List<TimeAmount> KarmaDecreasesInPastMinute = new List<TimeAmount>();
+
            public float PreviousNotifiedKarma;

+            public double PreviousKarmaNotificationTime;
+
            public float StructureDamageAccumulator;
            
            private float structureDamagePerSecond;
@@ -23,6 +34,9 @@ namespace Barotrauma
                set { structureDamagePerSecond = value; }
            }

+            public List<TimeAmount> StunsInPastMinute = new List<TimeAmount>();
+            public float StunKarmaDecreaseMultiplier;
+
            //when did a given character last attack this one
            public Dictionary<Character, double> LastAttackTime
            {
@@ -53,6 +67,13 @@ namespace Barotrauma
                    clientMemory.StructureDamagePerSecond = clientMemory.StructureDamageAccumulator;
                    clientMemory.StructureDamageAccumulator = 0.0f;

+                    clientMemory.StunsInPastMinute.RemoveAll(s => s.Time + 60.0f < Timing.TotalTime);
+
+                    if (!clientMemory.StunsInPastMinute.Any())
+                    {
+                        clientMemory.StunKarmaDecreaseMultiplier = 1.0f;
+                    }
+
                    var toRemove = clientMemory.LastAttackTime.Where(pair => pair.Value < Timing.TotalTime - AllowedRetaliationTime).Select(pair => pair.Key).ToList();
                    foreach (var lastAttacker in toRemove)
                    {
@@ -89,28 +110,26 @@ namespace Barotrauma

            var clientMemory = GetClientMemory(client);
            float karmaChange = client.Karma - clientMemory.PreviousNotifiedKarma;
-            if (Math.Abs(karmaChange) > 1.0f &&
-                (TestMode || Math.Abs(karmaChange) / clientMemory.PreviousNotifiedKarma > KarmaNotificationInterval / 100.0f))
+            if (Math.Abs(karmaChange) > 1.0f && TestMode)
            {
-                if (TestMode)
+                string msg =
+                    karmaChange < 0 ? $"Your karma has decreased to {client.Karma}" : $"Your karma has increased to {client.Karma}";
+                if (!string.IsNullOrEmpty(debugKarmaChangeReason))
                {
-                    string msg =
-                        karmaChange < 0 ? $"Your karma has decreased to {client.Karma}" : $"Your karma has increased to {client.Karma}";
-                    if (!string.IsNullOrEmpty(debugKarmaChangeReason))
-                    {
-                        msg += $". Reason: {debugKarmaChangeReason}";
-                    }
-                    GameMain.Server.SendDirectChatMessage(msg, client);
+                    msg += $". Reason: {debugKarmaChangeReason}";
                }
-                else if (Math.Abs(KickBanThreshold - client.Karma) < KarmaNotificationInterval)
-                {
-                    GameMain.Server.SendDirectChatMessage(TextManager.Get("KarmaBanWarning"), client);
-                }
-                else
-                {
-                    GameMain.Server.SendDirectChatMessage(TextManager.Get(karmaChange < 0 ? "KarmaDecreasedUnknownAmount" : "KarmaIncreasedUnknownAmount"), client);
-                }
-                clientMemory.PreviousNotifiedKarma = client.Karma;                
+                GameMain.Server.SendDirectChatMessage(msg, client);
+                clientMemory.PreviousNotifiedKarma = client.Karma;
+                clientMemory.PreviousKarmaNotificationTime = Timing.TotalTime;
+            }
+            else if (Timing.TotalTime >= clientMemory.PreviousKarmaNotificationTime + 5.0f &&
+                     clientMemory.PreviousNotifiedKarma >= KickBanThreshold + KarmaNotificationInterval &&
+                     client.Karma < KickBanThreshold + KarmaNotificationInterval)
+            {
+                GameMain.Server.SendDirectChatMessage(TextManager.Get("KarmaBanWarning"), client);
+                GameServer.Log(GameServer.ClientLogName(client) + " has been warned for having dangerously low karma.", ServerLog.MessageType.Karma);
+                clientMemory.PreviousNotifiedKarma = client.Karma;
+                clientMemory.PreviousKarmaNotificationTime = Timing.TotalTime;
            }
        }

@@ -130,10 +149,10 @@ namespace Barotrauma
                //increase the strength of the herpes affliction in steps instead of linearly
                //otherwise clients could determine their exact karma value from the strength
                float herpesStrength = 0.0f;
-                if (client.Karma < 20)                
-                    herpesStrength = 100.0f;                
-                else if (client.Karma < 30)                
-                    herpesStrength = 60.0f;                
+                if (client.Karma < 20)
+                    herpesStrength = 100.0f;
+                else if (client.Karma < 30)
+                    herpesStrength = 60.0f;
                else if (client.Karma < 40.0f)
                    herpesStrength = 30.0f;
                
@@ -141,6 +160,8 @@ namespace Barotrauma
                if (existingAffliction == null && herpesStrength > 0.0f)
                {
                    client.Character.CharacterHealth.ApplyAffliction(null, new Affliction(herpesAffliction, herpesStrength));
+                    GameServer.Log($"{GameServer.ClientLogName(client)} has contracted space herpes due to low karma.", ServerLog.MessageType.Karma);
+                    GameMain.NetworkMember.LastClientListUpdateID++;
                }
                else if (existingAffliction != null)
                {
@@ -205,7 +226,84 @@ namespace Barotrauma
            clientMemories.Remove(client);
        }

-        public void OnCharacterHealthChanged(Character target, Character attacker, float damage, IEnumerable<Affliction> appliedAfflictions = null)
+        // ReSharper disable once UseNegatedPatternMatching, LoopCanBeConvertedToQuery
+        public void OnItemTakenFromPlayer(CharacterInventory inventory, Client yoinker, Item item)
+        {
+            Client targetClient = GameMain.Server.ConnectedClients.Find(c => c.Character == inventory.Owner);
+            
+            Character yoinkerCharacter = yoinker?.Character;
+            Character targetCharacter = inventory.Owner as Character;
+
+            if (yoinker == null || item == null || yoinkerCharacter == null || targetCharacter == null || yoinkerCharacter == targetCharacter) { return; }
+            
+            if (targetClient == null && (!DangerousItemStealBots || targetCharacter.AIController == null)) { return; }
+
+            // Only if the target is alive and they are stunned, unconscious or handcuffed
+            if (targetCharacter.IsDead || targetCharacter.Removed || !(targetCharacter.Stun > 0) && !targetCharacter.IsUnconscious && !targetCharacter.LockHands) { return; }
+            
+            if (GameMain.Server.TraitorManager?.Traitors != null)
+            {
+                if (GameMain.Server.TraitorManager.Traitors.Any(t => t.Character == targetCharacter ||  t.Character == yoinkerCharacter))
+                {
+                    // Don't penalize traitors
+                    return;
+                }
+            }
+            
+            var foundItem = Inventory.FindItemRecursive(item, it => it.Prefab.Identifier == "idcard" || it.GetComponent<RangedWeapon>() != null || it.GetComponent<MeleeWeapon>() != null);
+
+            if (foundItem == null) { return; }
+
+            bool isIdCard = foundItem.prefab.Identifier == "idcard";
+            bool isWeapon = foundItem.GetComponent<RangedWeapon>() != null || foundItem.GetComponent<MeleeWeapon>() != null;
+
+            if (isIdCard)
+            {
+                string name = string.Empty;
+
+                foreach (var tag in foundItem.Tags.Split(','))
+                {
+                    string[] split = tag.Split(':');
+                    string key = split.Length > 0 ? split[0] : string.Empty;
+                    string value = split.Length > 1 ? split[1] : string.Empty;
+                    if (key == "name") { name = value; }
+                }
+
+                // Name tag doesn't belong to anyone in particular or we own the ID card
+                if (name == null || name == yoinkerCharacter.Name) { return; }
+            }
+
+            if (MathUtils.NearlyEqual(DangerousItemStealKarmaDecrease, 0)) { return; }
+
+            const float calcUpper = 1, calcLower = -1;
+
+            float upper = DangerousItemStealKarmaDecrease + 10.0f;
+            float lower = DangerousItemStealKarmaDecrease - 10.0f;
+
+            if (lower < 0)
+            {
+                upper += Math.Abs(lower);
+                lower = 0;
+            }
+
+            // If we're stealing from a bot assume the bot has 50 karma
+            var targetKarma = targetClient?.Karma ?? 50;
+
+            float karmaDifference = Math.Clamp((targetKarma - yoinker.Karma) / 50.0f, calcLower, calcUpper);
+            float karmaDecrease = lower + (karmaDifference - calcLower) * (upper - lower) / (calcUpper - calcLower);
+
+            JobPrefab clientJob = yoinker.CharacterInfo?.Job?.Prefab;
+
+            // security officers receive less karma penalty
+            if (clientJob != null && clientJob.Identifier == "securityofficer" && isWeapon)
+            {
+                karmaDecrease *= 0.5f;
+            }
+
+            AdjustKarma(yoinkerCharacter, -karmaDecrease, "Stolen dangerous item");
+        }
+
+        public void OnCharacterHealthChanged(Character target, Character attacker, float damage, float stun, IEnumerable<Affliction> appliedAfflictions = null)
        {
            if (target == null || attacker == null) { return; }
            if (target == attacker) { return; }
@@ -238,11 +336,11 @@ namespace Barotrauma

            if (appliedAfflictions != null)
            {
-                foreach (Affliction affliction in appliedAfflictions)
-                {
-                    if (MathUtils.NearlyEqual(affliction.Prefab.KarmaChangeOnApplied, 0.0f)) { continue; }
-                    damage -= affliction.Prefab.KarmaChangeOnApplied * affliction.Strength;
-                }
+               foreach (Affliction affliction in appliedAfflictions)
+               {
+                   if (MathUtils.NearlyEqual(affliction.Prefab.KarmaChangeOnApplied, 0.0f)) { continue; }
+                   damage -= affliction.Prefab.KarmaChangeOnApplied * affliction.Strength;
+               }
            }

            Client targetClient = GameMain.Server.ConnectedClients.Find(c => c.Character == target);
@@ -253,15 +351,16 @@ namespace Barotrauma
            }            

            Client attackerClient = GameMain.Server.ConnectedClients.Find(c => c.Character == attacker);
-            if (attackerClient != null)
+            ClientMemory attackerMemory = GetClientMemory(attackerClient);
+            if (attackerMemory != null)
            {
                //if the attacker has been attacked by the target within the last x seconds, ignore the damage
                //(= no karma penalty from retaliating against someone who attacked you)
-                var attackerMemory = GetClientMemory(attackerClient);
                if (attackerMemory.LastAttackTime.ContainsKey(target) &&
                    attackerMemory.LastAttackTime[target] > Timing.TotalTime - AllowedRetaliationTime)
                {
                    damage = Math.Min(damage, 0);
+                    stun = 0.0f;
                }
            }

@@ -270,6 +369,7 @@ namespace Barotrauma
                target.HasEquippedItem("clowncostume"))
            {
                damage *= 0.5f;
+                stun *= 0.5f;
            }

            //smaller karma penalty for attacking someone who's aiming with a weapon
@@ -278,6 +378,7 @@ namespace Barotrauma
                target.SelectedItems.Any(it => it != null && (it.GetComponent<MeleeWeapon>() != null || it.GetComponent<RangedWeapon>() != null)))
            {
                damage *= 0.5f;
+                stun *= 0.5f;
            }

            //damage scales according to the karma of the target
@@ -298,6 +399,30 @@ namespace Barotrauma
            }
            else
            {
+                if (stun > 0 && attackerMemory != null)
+                {
+                    //GameServer.Log(GameServer.CharacterLogName(attacker) + " stunned " + GameServer.CharacterLogName(target) + $" ({stun})", ServerLog.MessageType.Karma);
+                    attackerMemory.StunsInPastMinute.Add(new ClientMemory.TimeAmount() { Time = Timing.TotalTime, Amount = stun });
+
+                    if (attackerMemory.StunsInPastMinute.Count > 1)
+                    {
+                        float avgStunsInflicted = attackerMemory.StunsInPastMinute[0].Amount / (float)(attackerMemory.StunsInPastMinute[1].Time - attackerMemory.StunsInPastMinute[0].Time);
+                        for (int i = 1; i < attackerMemory.StunsInPastMinute.Count; i++)
+                        {
+                            avgStunsInflicted += attackerMemory.StunsInPastMinute[i].Amount / (float)(attackerMemory.StunsInPastMinute[i].Time - attackerMemory.StunsInPastMinute[i - 1].Time);
+                        }
+
+                        //GameServer.Log(avgStunsInflicted.ToString(), ServerLog.MessageType.Karma);
+
+                        if (avgStunsInflicted > StunFriendlyKarmaDecreaseThreshold ||
+                            attackerMemory.StunKarmaDecreaseMultiplier > 1.0f)
+                        {
+                            AdjustKarma(attacker, -StunFriendlyKarmaDecrease * attackerMemory.StunKarmaDecreaseMultiplier, "Stunned friendly");
+                            attackerMemory.StunKarmaDecreaseMultiplier *= 2.0f;
+                        }
+                    }
+                }
+
                if (damage > 0)
                {
                    AdjustKarma(attacker, -damage * DamageFriendlyKarmaDecrease, "Damaged friendly");
@@ -395,6 +520,7 @@ namespace Barotrauma

        private ClientMemory GetClientMemory(Client client)
        {
+            if (client == null) { return null; }
            if (!clientMemories.ContainsKey(client))
            {
                clientMemories[client] = new ClientMemory()
@@ -429,6 +555,21 @@ namespace Barotrauma
            }

            client.Karma += amount;
+
+            if (amount < 0.0f)
+            {
+                float? herpesStrength = client.Character?.CharacterHealth.GetAfflictionStrength("spaceherpes");
+                var clientMemory = GetClientMemory(client);
+                clientMemory.KarmaDecreasesInPastMinute.RemoveAll(ta => ta.Time + 60.0f < Timing.TotalTime);
+                float aggregate = clientMemory.KarmaDecreasesInPastMinute.Select(ta => ta.Amount).DefaultIfEmpty().Aggregate((a, b) => a + b);
+                clientMemory.KarmaDecreasesInPastMinute.Add(new ClientMemory.TimeAmount() { Time = Timing.TotalTime, Amount = -amount });
+
+                if (herpesStrength.HasValue && herpesStrength <= 0.0f && aggregate - amount > 25.0f && aggregate <= 25.0f)
+                {
+                    GameServer.Log($"{GameServer.ClientLogName(client)} has lost more than 25 karma in the past minute.", ServerLog.MessageType.Karma);
+                }
+            }
+
            if (TestMode)
            {
                SendKarmaNotifications(client, debugKarmaChangeReason);
@@ -138,7 +138,12 @@ namespace Barotrauma.Networking
            //remove old events that have been sent to all clients, they are redundant now
            //  keep at least one event in the list (lastSentToAll == e.ID) so we can use it to keep track of the latest ID
            //  and events less than 15 seconds old to give disconnected clients a bit of time to reconnect without getting desynced
-            events.RemoveAll(e => (NetIdUtils.IdMoreRecent(lastSentToAll, e.ID) || !inGameClientsPresent) && e.CreateTime < Timing.TotalTime - 15.0f);
+            if (Timing.TotalTime > GameMain.GameSession.RoundStartTime + NetConfig.RoundStartSyncDuration)
+            {
+                events.RemoveAll(e => 
+                    (NetIdUtils.IdMoreRecent(lastSentToAll, e.ID) || !inGameClientsPresent) && 
+                    e.CreateTime < Timing.TotalTime - NetConfig.EventRemovalTime);
+            }
            
            for (int i = events.Count - 1; i >= 0; i--)
            {
@@ -175,7 +180,7 @@ namespace Barotrauma.Networking

                //UNLESS the character is unconscious, in which case we'll read the messages immediately (because further inputs will be ignored)
                //atm the "give in" command is the only thing unconscious characters can do, other types of events are ignored
-                if (!bufferedEvent.Character.IsUnconscious &&
+                if (!bufferedEvent.Character.IsIncapacitated &&
                    NetIdUtils.IdMoreRecent(bufferedEvent.CharacterStateID, bufferedEvent.Character.LastProcessedID))
                {
                    continue;
@@ -224,7 +229,9 @@ namespace Barotrauma.Networking
                });
                lastSentToAnyoneTime = events.Find(e => e.ID == lastSentToAnyone)?.CreateTime ?? Timing.TotalTime;

-                if ((Timing.TotalTime - lastSentToAnyoneTime) > 10.0 && (Timing.TotalTime - lastWarningTime) > 5.0)
+                if (Timing.TotalTime - lastWarningTime > 5.0 && 
+                    Timing.TotalTime - lastSentToAnyoneTime > 10.0 && 
+                    Timing.TotalTime > GameMain.GameSession.RoundStartTime + NetConfig.RoundStartSyncDuration)
                {
                    lastWarningTime = Timing.TotalTime;
                    GameServer.Log("WARNING: ServerEntityEventManager is lagging behind! Last sent id: " + lastSentToAnyone.ToString() + ", latest create id: " + ID.ToString(), ServerLog.MessageType.ServerMessage);
@@ -235,19 +242,21 @@ namespace Barotrauma.Networking
                clients.Where(c => c.NeedsMidRoundSync).ForEach(c => { if (NetIdUtils.IdMoreRecent(lastSentToAll, c.FirstNewEventID)) lastSentToAll = (ushort)(c.FirstNewEventID - 1); });

                ServerEntityEvent firstEventToResend = events.Find(e => e.ID == (ushort)(lastSentToAll + 1));
-                if (firstEventToResend != null && ((lastSentToAnyoneTime - firstEventToResend.CreateTime) > 10.0 || (Timing.TotalTime - firstEventToResend.CreateTime) > 30.0))
+                if (firstEventToResend != null &&
+                    Timing.TotalTime > GameMain.GameSession.RoundStartTime + NetConfig.RoundStartSyncDuration &&
+                    ((lastSentToAnyoneTime - firstEventToResend.CreateTime) > NetConfig.OldReceivedEventKickTime || (Timing.TotalTime - firstEventToResend.CreateTime) > NetConfig.OldEventKickTime))
                {
                    //  This event is 10 seconds older than the last one we've successfully sent,
                    //  kick everyone that hasn't received it yet, this is way too old
                    //  UNLESS the event was created when the client was still midround syncing,
                    //  in which case we'll wait until the timeout runs out before kicking the client
                    List<Client> toKick = inGameClients.FindAll(c => 
-                        NetIdUtils.IdMoreRecent((UInt16)(lastSentToAll + 1), c.LastRecvEntityEventID) && 
+                        NetIdUtils.IdMoreRecent((UInt16)(lastSentToAll + 1), c.LastRecvEntityEventID) &&
                        (firstEventToResend.CreateTime > c.MidRoundSyncTimeOut || lastSentToAnyoneTime > c.MidRoundSyncTimeOut || Timing.TotalTime > c.MidRoundSyncTimeOut + 10.0));
                    toKick.ForEach(c =>
                        {
                            DebugConsole.NewMessage(c.Name + " was kicked due to excessive desync (expected old event " + (c.LastRecvEntityEventID + 1).ToString() + ")", Color.Red);
-                            GameServer.Log("Disconnecting client " + c.Name + " due to excessive desync (expected old event "
+                            GameServer.Log("Disconnecting client " + GameServer.ClientLogName(c) + " due to excessive desync (expected old event "
                                + (c.LastRecvEntityEventID + 1).ToString() +
                                " (created " + (Timing.TotalTime - firstEventToResend.CreateTime).ToString("0.##") + " s ago, " +
                                (lastSentToAnyoneTime - firstEventToResend.CreateTime).ToString("0.##") + " s older than last event sent to anyone)" +
@@ -265,7 +274,7 @@ namespace Barotrauma.Networking
                    toKick.ForEach(c =>
                    {
                        DebugConsole.NewMessage(c.Name + " was kicked due to excessive desync (expected removed event " + (c.LastRecvEntityEventID + 1).ToString() + ", last available is " + events[0].ID.ToString() + ")", Color.Red);
-                        GameServer.Log("Disconnecting client " + c.Name + " due to excessive desync (expected removed event " + (c.LastRecvEntityEventID + 1).ToString() + ", last available is " + events[0].ID.ToString() + ")", ServerLog.MessageType.Error);
+                        GameServer.Log("Disconnecting client " + GameServer.ClientLogName(c) + " due to excessive desync (expected removed event " + (c.LastRecvEntityEventID + 1).ToString() + ", last available is " + events[0].ID.ToString() + ")", ServerLog.MessageType.Error);
                        server.DisconnectClient(c, "", DisconnectReason.ExcessiveDesyncRemovedEvent + "/ServerMessage.ExcessiveDesyncRemovedEvent");
                    });
                }
@@ -274,7 +283,7 @@ namespace Barotrauma.Networking
            var timedOutClients = clients.FindAll(c => c.Connection != GameMain.Server.OwnerConnection && c.InGame && c.NeedsMidRoundSync && Timing.TotalTime > c.MidRoundSyncTimeOut);
            foreach (Client timedOutClient in timedOutClients)
            {
-                GameServer.Log("Disconnecting client " + timedOutClient.Name + ". Syncing the client with the server took too long.", ServerLog.MessageType.Error);
+                GameServer.Log("Disconnecting client " + GameServer.ClientLogName(timedOutClient) + ". Syncing the client with the server took too long.", ServerLog.MessageType.Error);
                GameMain.Server.DisconnectClient(timedOutClient, "", DisconnectReason.SyncTimeout + "/ServerMessage.SyncTimeout");
            }

@@ -419,12 +419,12 @@ namespace Barotrauma.Networking

                        //steam auth cannot be done (SteamManager not initialized or no ticket given),
                        //but it's not required either -> let the client join without auth
-                        if ((!Steam.SteamManager.IsInitialized || (ticket?.Length??0) == 0) &&
+                        if ((!Steam.SteamManager.IsInitialized || (ticket?.Length ?? 0) == 0) &&
                            !requireSteamAuth)
                        {
                            pendingClient.Name = name;
                            pendingClient.OwnerKey = ownKey;
-                            pendingClient.InitializationStep = ConnectionInitialization.ContentPackageOrder;
+                            pendingClient.InitializationStep = serverSettings.HasPassword ? ConnectionInitialization.Password : ConnectionInitialization.ContentPackageOrder;
                        }
                        else
                        {
@@ -258,6 +258,9 @@ namespace Barotrauma.Networking
            {
                bool bot = i >= clients.Count;

+                characterInfos[i].CurrentOrder = null;
+                characterInfos[i].CurrentOrderOption = null;
+
                var character = Character.Create(characterInfos[i], shuttleSpawnPoints[i].WorldPosition, characterInfos[i].Name, !bot, bot);
                character.TeamID = Character.TeamType.Team1;

@@ -279,7 +282,7 @@ namespace Barotrauma.Networking
                    clients[i].Character = character;
                    character.OwnerClientEndPoint = clients[i].Connection.EndPointString;
                    character.OwnerClientName = clients[i].Name;
-                    GameServer.Log(string.Format("Respawning {0} ({1}) as {2}", clients[i].Name, clients[i].Connection?.EndPointString, characterInfos[i].Job.Name), ServerLog.MessageType.Spawning);
+                    GameServer.Log(string.Format("Respawning {0} ({1}) as {2}", GameServer.ClientLogName(clients[i]), clients[i].Connection?.EndPointString, characterInfos[i].Job.Name), ServerLog.MessageType.Spawning);
                }

                if (divingSuitPrefab != null && oxyPrefab != null && RespawnShuttle != null)
@@ -108,7 +108,7 @@ namespace Barotrauma.Networking
                        netProperties[key].Read(incMsg);
                        if (!netProperties[key].PropEquals(prevValue, netProperties[key]))
                        {
-                            GameServer.Log(c.Name + " changed " + netProperties[key].Name + " to " + netProperties[key].Value.ToString(), ServerLog.MessageType.ServerMessage);
+                            GameServer.Log(GameServer.ClientLogName(c) + " changed " + netProperties[key].Name + " to " + netProperties[key].Value.ToString(), ServerLog.MessageType.ServerMessage);
                        }
                        changed = true;
                    }
@@ -367,7 +367,7 @@ namespace Barotrauma.Networking
                if (clientElement.Attribute("preset") == null)
                {
                    string permissionsStr = clientElement.GetAttributeString("permissions", "");
-                    if (permissionsStr.ToLowerInvariant() == "all")
+                    if (permissionsStr.Equals("all", StringComparison.OrdinalIgnoreCase))
                    {
                        foreach (ClientPermissions permission in Enum.GetValues(typeof(ClientPermissions)))
                        {
@@ -384,7 +384,7 @@ namespace Barotrauma.Networking
                    {
                        foreach (XElement commandElement in clientElement.Elements())
                        {
-                            if (commandElement.Name.ToString().ToLowerInvariant() != "command") continue;
+                            if (!commandElement.Name.ToString().Equals("command", StringComparison.OrdinalIgnoreCase)) { continue; }

                            string commandName = commandElement.GetAttributeString("name", "");
                            DebugConsole.Command command = DebugConsole.FindCommand(commandName);
@@ -89,7 +89,8 @@ namespace Barotrauma.Networking
            if (sender.Character != null && sender.Character.SpeechImpediment >= 100.0f) { return false; }

            //check if the message can be sent via radio
-            if (ChatMessage.CanUseRadio(sender.Character, out WifiComponent senderRadio) && 
+            if (!sender.VoipQueue.ForceLocal &&
+                ChatMessage.CanUseRadio(sender.Character, out WifiComponent senderRadio) && 
                ChatMessage.CanUseRadio(recipient.Character, out WifiComponent recipientRadio))
            {
                if (recipientRadio.CanReceive(senderRadio)) { return true; }
@@ -38,7 +38,7 @@ namespace Barotrauma
            {
                case VoteType.Sub:
                    string subName = inc.ReadString();
-                    Submarine sub = Submarine.SavedSubmarines.FirstOrDefault(s => s.Name == subName);
+                    SubmarineInfo sub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName);
                    sender.SetVote(voteType, sub);
                    break;

@@ -74,7 +74,7 @@ namespace Barotrauma
                    if (ready != sender.GetVote<bool>(VoteType.StartRound))
                    {
                        sender.SetVote(VoteType.StartRound, ready);
-                        GameServer.Log(sender.Name + (ready ? " is ready to start the game." : " is not ready to start the game."), ServerLog.MessageType.ServerMessage);
+                        GameServer.Log(GameServer.ClientLogName(sender) + (ready ? " is ready to start the game." : " is not ready to start the game."), ServerLog.MessageType.ServerMessage);
                    }

                    break;
@@ -97,7 +97,7 @@ namespace Barotrauma
                foreach (Pair<object, int> vote in voteList)
                {
                    msg.Write((byte)vote.Second);
-                    msg.Write(((Submarine)vote.First).Name);
+                    msg.Write(((SubmarineInfo)vote.First).Name);
                }
            }
            msg.Write(AllowModeVoting);
@@ -181,7 +181,7 @@ namespace Barotrauma.Networking
                    WhiteListedPlayer whitelistedPlayer = whitelistedPlayers.Find(p => p.UniqueIdentifier == id);
                    if (whitelistedPlayer != null)
                    {
-                        GameServer.Log(c.Name + " removed " + whitelistedPlayer.Name + " from whitelist (" + whitelistedPlayer.IP + ")", ServerLog.MessageType.ConsoleUsage);
+                        GameServer.Log(GameServer.ClientLogName(c) + " removed " + whitelistedPlayer.Name + " from whitelist (" + whitelistedPlayer.IP + ")", ServerLog.MessageType.ConsoleUsage);
                        RemoveFromWhiteList(whitelistedPlayer);
                    }
                }
@@ -192,7 +192,7 @@ namespace Barotrauma.Networking
                    string name = incMsg.ReadString();
                    string ip = incMsg.ReadString();

-                    GameServer.Log(c.Name + " added " + name + " to whitelist (" + ip + ")", ServerLog.MessageType.ConsoleUsage);
+                    GameServer.Log(GameServer.ClientLogName(c) + " added " + name + " to whitelist (" + ip + ")", ServerLog.MessageType.ConsoleUsage);
                    AddToWhiteList(name, ip);
                }