diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index 863f776e3ae..ea0febb97ed 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -72,6 +72,7 @@ public void Initialize() _netMgr.Disconnect += OnDisconnected; // DeltaV - Soft whitelist improvements _netMgr.AssignUserIdCallback = AssignUserIdCallback; _plyMgr.PlayerStatusChanged += PlayerStatusChanged; + _plyMgr.PlayerStatusChanged += PlayerStatusChanged; // Approval-based IP bans disabled because they don't play well with Happy Eyeballs. // _netMgr.HandleApprovalCallback = HandleApproval; } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 290d8e25738..993557a229b 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -281,6 +281,13 @@ public static readonly CVarDef public static readonly CVarDef SoftMaxPlayers = CVarDef.Create("game.soft_max_players", 30, CVar.SERVERONLY | CVar.ARCHIVE); + /// + /// If a player gets denied connection to the server, + /// how long they are forced to wait before attempting to reconnect. + /// + public static readonly CVarDef GameServerFullReconnectDelay = + CVarDef.Create("game.server_full_reconnect_delay", 30, CVar.SERVERONLY); + /// /// Whether or not panic bunker is currently enabled. /// @@ -960,6 +967,15 @@ public static readonly CVarDef public static readonly CVarDef ServerBanErasePlayer = CVarDef.Create("admin.server_ban_erase_player", false, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED); + /// + /// Minimum players sharing a connection required to create an alert. -1 to disable the alert. + /// + /// + /// If you set this to 0 or 1 then it will alert on every connection, so probably don't do that. + /// + public static readonly CVarDef AdminAlertMinPlayersSharingConnection = + CVarDef.Create("admin.alert.min_players_sharing_connection", -1, CVar.SERVERONLY); + /// /// Minimum explosion intensity to create an admin alert message. -1 to disable the alert. /// diff --git a/Resources/Locale/en-US/administration/admin-alerts.ftl b/Resources/Locale/en-US/administration/admin-alerts.ftl new file mode 100644 index 00000000000..40ab4737dcc --- /dev/null +++ b/Resources/Locale/en-US/administration/admin-alerts.ftl @@ -0,0 +1 @@ +admin-alert-shared-connection = {$player} is sharing a connection with {$otherCount} connected player(s): {$otherList}