diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs index 1d8c278584..eb29617f49 100644 --- a/Content.Server/Administration/Systems/AdminSystem.cs +++ b/Content.Server/Administration/Systems/AdminSystem.cs @@ -82,13 +82,14 @@ public sealed class AdminSystem : EntitySystem Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true); Subs.CVar(_config, CCVars.PanicBunkerMinOverallMinutes, OnPanicBunkerMinOverallMinutesChanged, true); - SubscribeLocalEvent(OnIdentityChanged); SubscribeLocalEvent(OnPlayerAttached); SubscribeLocalEvent(OnPlayerDetached); SubscribeLocalEvent(OnRoleEvent); SubscribeLocalEvent(OnRoleEvent); SubscribeLocalEvent(OnRoundRestartCleanup); + SubscribeLocalEvent(OnPlayerRenamed); + SubscribeLocalEvent(OnIdentityChanged); } private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev) @@ -144,12 +145,9 @@ public sealed class AdminSystem : EntitySystem return value ?? null; } - private void OnIdentityChanged(ref IdentityChangedEvent ev) + private void OnIdentityChanged(Entity ent, ref IdentityChangedEvent ev) { - if (!TryComp(ev.CharacterEntity, out var actor)) - return; - - UpdatePlayerList(actor.PlayerSession); + UpdatePlayerList(ent.Comp.PlayerSession); } private void OnRoleEvent(RoleEvent ev) diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 1c2ce3cd2b..dd7db3d0c0 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -2,6 +2,7 @@ using System.Globalization; using System.Linq; using System.Numerics; using Content.Server.Administration.Managers; +using Content.Server.Administration.Systems; using Content.Server.GameTicking.Events; using Content.Server.Spawners.Components; using Content.Server.Speech.Components; @@ -27,6 +28,7 @@ namespace Content.Server.GameTicking { [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly SharedJobSystem _jobs = default!; + [Dependency] private readonly AdminSystem _admin = default!; [ValidatePrototypeId] public const string ObserverPrototypeName = "MobObserver"; @@ -233,6 +235,7 @@ namespace Content.Server.GameTicking _roles.MindAddJobRole(newMind, silent: silent, jobPrototype:jobId); var jobName = _jobs.MindTryGetJobName(newMind); + _admin.UpdatePlayerList(player); if (lateJoin && !silent) { diff --git a/Resources/Locale/ru-RU/administration/commands/babyjail.ftl b/Resources/Locale/ru-RU/administration/commands/babyjail.ftl deleted file mode 100644 index 49515de3a5..0000000000 --- a/Resources/Locale/ru-RU/administration/commands/babyjail.ftl +++ /dev/null @@ -1,16 +0,0 @@ -cmd-babyjail-desc = Toggles the baby jail, which enables stricter restrictions on who's allowed to join the server. -cmd-babyjail-help = Usage: babyjail -babyjail-command-enabled = Baby jail has been enabled. -babyjail-command-disabled = Baby jail has been disabled. -cmd-babyjail_show_reason-desc = Toggles whether or not to show connecting clients the reason why the baby jail blocked them from joining. -cmd-babyjail_show_reason-help = Usage: babyjail_show_reason -babyjail-command-show-reason-enabled = The baby jail will now show a reason to users it blocks from connecting. -babyjail-command-show-reason-disabled = The baby jail will no longer show a reason to users it blocks from connecting. -cmd-babyjail_max_account_age-desc = Gets or sets the maximum account age in minutes that an account can have to be allowed to connect with the baby jail enabled. -cmd-babyjail_max_account_age-help = Usage: babyjail_max_account_age -babyjail-command-max-account-age-is = The maximum account age for the baby jail is { $minutes } minutes. -babyjail-command-max-account-age-set = Set the maximum account age for the baby jail to { $minutes } minutes. -cmd-babyjail_max_overall_minutes-desc = Gets or sets the maximum overall playtime in minutes that an account can have to be allowed to connect with the baby jail enabled. -cmd-babyjail_max_overall_minutes-help = Usage: babyjail_max_overall_minutes -babyjail-command-max-overall-minutes-is = The maximum overall playtime for the baby jail is { $minutes } minutes. -babyjail-command-max-overall-minutes-set = Set the maximum overall playtime for the baby jail to { $minutes } minutes. diff --git a/Resources/Maps/Shuttles/emergency_elkridge.yml b/Resources/Maps/Shuttles/emergency_elkridge.yml index efeba6844b..4dafdee84a 100644 --- a/Resources/Maps/Shuttles/emergency_elkridge.yml +++ b/Resources/Maps/Shuttles/emergency_elkridge.yml @@ -18,7 +18,7 @@ entities: name: NT Evac Log - type: Transform pos: -0.42093527,-0.86894274 - parent: 637 + parent: invalid - type: MapGrid chunks: 0,0: @@ -804,18 +804,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - uid: 637 - components: - - type: MetaData - name: Map Entity - - type: Transform - - type: Map - mapPaused: True - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - proto: AirAlarm entities: - uid: 577 diff --git a/Resources/Prototypes/wizardsDenWhitelists.yml b/Resources/Prototypes/wizardsDenWhitelists.yml index c21d01e5a8..8b8420622a 100644 --- a/Resources/Prototypes/wizardsDenWhitelists.yml +++ b/Resources/Prototypes/wizardsDenWhitelists.yml @@ -12,20 +12,20 @@ range: 30 # 30 days action: Deny includeSecret: false - - !type:ConditionNotesPlaytimeRange # Deny for >=2 medium severity notes in the last 14 days + - !type:ConditionNotesPlaytimeRange # Deny for >=3 medium severity notes in the last 90 days includeExpired: false minimumSeverity: 2 # Medium - minimumNotes: 1 - range: 14 # 14 Days - action: Deny - includeSecret: false - - !type:ConditionNotesPlaytimeRange # Deny for >=3 low severity notes in the last 14 days - includeExpired: false - minimumSeverity: 1 # Low minimumNotes: 3 - range: 14 # 14 Days + range: 90 # 90 Days action: Deny includeSecret: false +# - !type:ConditionNotesPlaytimeRange # Deny for >=3 low severity notes in the last 14 days +# includeExpired: false +# minimumSeverity: 1 # Low +# minimumNotes: 3 +# range: 14 # 14 Days +# action: Deny +# includeSecret: false - !type:ConditionManualWhitelistMembership # Allow whitelisted players action: Allow - !type:ConditionPlayerCount # Allow when <= 15 players are online