Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream

# Conflicts: # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-11-06 16:53:24 +03:00
parent ae27cf7e08 24e6b9f42c
commit 955145a9a5
207 changed files with 2180 additions and 1314 deletions
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -35,8 +35,10 @@ using Robust.Shared.Toolshed;
 using Robust.Shared.Utility;
 using System.Linq;
 using Content.Server.Silicons.Laws;
+using Content.Shared.Movement.Components;
 using Content.Shared.Silicons.Laws.Components;
 using Robust.Server.Player;
+using Content.Shared.Silicons.StationAi;
 using Robust.Shared.Physics.Components;
 using static Content.Shared.Configurable.ConfigurationComponent;

@@ -345,7 +347,30 @@ namespace Content.Server.Administration.Systems
                    Impact = LogImpact.Low
                });

-                if (TryComp<SiliconLawBoundComponent>(args.Target, out var lawBoundComponent))
+                // This logic is needed to be able to modify the AI's laws through its core and eye.
+                EntityUid? target = null;
+                SiliconLawBoundComponent? lawBoundComponent = null;
+
+                if (TryComp(args.Target, out lawBoundComponent))
+                {
+                    target = args.Target;
+                }
+                // When inspecting the core we can find the entity with its laws by looking at the  AiHolderComponent.
+                else if (TryComp<StationAiHolderComponent>(args.Target, out var holder) && holder.Slot.Item != null
+                         && TryComp(holder.Slot.Item, out lawBoundComponent))
+                {
+                    target = holder.Slot.Item.Value;
+                    // For the eye we can find the entity with its laws as the source of the movement relay since the eye
+                    // is just a proxy for it to move around and look around the station.
+                }
+                else if (TryComp<MovementRelayTargetComponent>(args.Target, out var relay)
+                         && TryComp(relay.Source, out lawBoundComponent))
+                {
+                    target = relay.Source;
+
+                }
+
+                if (lawBoundComponent != null && target != null)
                {
                    args.Verbs.Add(new Verb()
                    {
@@ -359,7 +384,7 @@ namespace Content.Server.Administration.Systems
                                return;
                            }
                            _euiManager.OpenEui(ui, session);
-                            ui.UpdateLaws(lawBoundComponent, args.Target);
+                            ui.UpdateLaws(lawBoundComponent, target.Value);
                        },
                        Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Actions/actions_borg.rsi"), "state-laws"),
                    });
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -47,20 +47,23 @@ namespace Content.Server.Administration.Systems
        [GeneratedRegex(@"^https://discord\.com/api/webhooks/(\d+)/((?!.*/).*)$")]
        private static partial Regex DiscordRegex();

-        private ISawmill _sawmill = default!;
-        private readonly HttpClient _httpClient = new();
        private string _webhookUrl = string.Empty;
        private WebhookData? _webhookData;
+
+        private string _onCallUrl = string.Empty;
+        private WebhookData? _onCallData;
+
+        private ISawmill _sawmill = default!;
+        private readonly HttpClient _httpClient = new();
+
        private string _footerIconUrl = string.Empty;
        private string _avatarUrl = string.Empty;
        private string _serverName = string.Empty;

-        private readonly
-            Dictionary<NetUserId, (string? id, string username, string description, string? characterName, GameRunLevel
-                lastRunLevel)> _relayMessages = new();
+        private readonly Dictionary<NetUserId, DiscordRelayInteraction> _relayMessages = new();

        private Dictionary<NetUserId, string> _oldMessageIds = new();
-        private readonly Dictionary<NetUserId, Queue<string>> _messageQueues = new();
+        private readonly Dictionary<NetUserId, Queue<DiscordRelayedData>> _messageQueues = new();
        private readonly HashSet<NetUserId> _processingChannels = new();
        private readonly Dictionary<NetUserId, (TimeSpan Timestamp, bool Typing)> _typingUpdateTimestamps = new();
        private string _overrideClientName = string.Empty;
@@ -82,12 +85,16 @@ namespace Content.Server.Administration.Systems
        public override void Initialize()
        {
            base.Initialize();
+
+            Subs.CVar(_config, CCVars.DiscordOnCallWebhook, OnCallChanged, true);
+
            Subs.CVar(_config, CCVars.DiscordAHelpWebhook, OnWebhookChanged, true);
            Subs.CVar(_config, CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged, true);
            Subs.CVar(_config, CCVars.DiscordAHelpAvatar, OnAvatarChanged, true);
            Subs.CVar(_config, CVars.GameHostName, OnServerNameChanged, true);
            Subs.CVar(_config, CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true);
            _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("AHELP");
+
            var defaultParams = new AHelpMessageParams(
                string.Empty,
                string.Empty,
@@ -96,7 +103,7 @@ namespace Content.Server.Administration.Systems
                _gameTicker.RunLevel,
                playedSound: false
            );
-            _maxAdditionalChars = GenerateAHelpMessage(defaultParams).Length;
+            _maxAdditionalChars = GenerateAHelpMessage(defaultParams).Message.Length;
            _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;

            SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameRunLevelChanged);
@@ -111,6 +118,33 @@ namespace Content.Server.Administration.Systems
                );
        }

+        private async void OnCallChanged(string url)
+        {
+            _onCallUrl = url;
+
+            if (url == string.Empty)
+                return;
+
+            var match = DiscordRegex().Match(url);
+
+            if (!match.Success)
+            {
+                Log.Error("On call URL does not appear to be valid.");
+                return;
+            }
+
+            if (match.Groups.Count <= 2)
+            {
+                Log.Error("Could not get webhook ID or token for on call URL.");
+                return;
+            }
+
+            var webhookId = match.Groups[1].Value;
+            var webhookToken = match.Groups[2].Value;
+
+            _onCallData = await GetWebhookData(webhookId, webhookToken);
+        }
+
        private void PlayerRateLimitedAction(ICommonSession obj)
        {
            RaiseNetworkEvent(
@@ -259,13 +293,13 @@ namespace Content.Server.Administration.Systems

            // Store the Discord message IDs of the previous round
            _oldMessageIds = new Dictionary<NetUserId, string>();
-            foreach (var message in _relayMessages)
+            foreach (var (user, interaction) in _relayMessages)
            {
-                var id = message.Value.id;
+                var id = interaction.Id;
                if (id == null)
                    return;

-                _oldMessageIds[message.Key] = id;
+                _oldMessageIds[user] = id;
            }

            _relayMessages.Clear();
@@ -330,10 +364,10 @@ namespace Content.Server.Administration.Systems
            var webhookToken = match.Groups[2].Value;

            // Fire and forget
-            await SetWebhookData(webhookId, webhookToken);
+            _webhookData = await GetWebhookData(webhookId, webhookToken);
        }

-        private async Task SetWebhookData(string id, string token)
+        private async Task<WebhookData?> GetWebhookData(string id, string token)
        {
            var response = await _httpClient.GetAsync($"https://discord.com/api/v10/webhooks/{id}/{token}");

@@ -342,10 +376,10 @@ namespace Content.Server.Administration.Systems
            {
                _sawmill.Log(LogLevel.Error,
                    $"Discord returned bad status code when trying to get webhook data (perhaps the webhook URL is invalid?): {response.StatusCode}\nResponse: {content}");
-                return;
+                return null;
            }

-            _webhookData = JsonSerializer.Deserialize<WebhookData>(content);
+            return JsonSerializer.Deserialize<WebhookData>(content);
        }

        private void OnFooterIconChanged(string url)
@@ -358,14 +392,14 @@ namespace Content.Server.Administration.Systems
            _avatarUrl = url;
        }

-        private async void ProcessQueue(NetUserId userId, Queue<string> messages)
+        private async void ProcessQueue(NetUserId userId, Queue<DiscordRelayedData> messages)
        {
            // Whether an embed already exists for this player
            var exists = _relayMessages.TryGetValue(userId, out var existingEmbed);

            // Whether the message will become too long after adding these new messages
-            var tooLong = exists && messages.Sum(msg => Math.Min(msg.Length, MessageLengthCap) + "\n".Length)
-                + existingEmbed.description.Length > DescriptionMax;
+            var tooLong = exists && messages.Sum(msg => Math.Min(msg.Message.Length, MessageLengthCap) + "\n".Length)
+                    + existingEmbed?.Description.Length > DescriptionMax;

            // If there is no existing embed, or it is getting too long, we create a new embed
            if (!exists || tooLong)
@@ -385,10 +419,10 @@ namespace Content.Server.Administration.Systems
                // If we have all the data required, we can link to the embed of the previous round or embed that was too long
                if (_webhookData is { GuildId: { } guildId, ChannelId: { } channelId })
                {
-                    if (tooLong && existingEmbed.id != null)
+                    if (tooLong && existingEmbed?.Id != null)
                    {
                        linkToPrevious =
-                            $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.id})**\n";
+                            $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.Id})**\n";
                    }
                    else if (_oldMessageIds.TryGetValue(userId, out var id) && !string.IsNullOrEmpty(id))
                    {
@@ -398,13 +432,22 @@ namespace Content.Server.Administration.Systems
                }

                var characterName = _minds.GetCharacterName(userId);
-                existingEmbed = (null, lookup.Username, linkToPrevious, characterName, _gameTicker.RunLevel);
+                existingEmbed = new DiscordRelayInteraction()
+                {
+                    Id = null,
+                    CharacterName = characterName,
+                    Description = linkToPrevious,
+                    Username = lookup.Username,
+                    LastRunLevel = _gameTicker.RunLevel,
+                };
+
+                _relayMessages[userId] = existingEmbed;
            }

            // Previous message was in another RunLevel, so show that in the embed
-            if (existingEmbed.lastRunLevel != _gameTicker.RunLevel)
+            if (existingEmbed!.LastRunLevel != _gameTicker.RunLevel)
            {
-                existingEmbed.description += _gameTicker.RunLevel switch
+                existingEmbed.Description += _gameTicker.RunLevel switch
                {
                    GameRunLevel.PreRoundLobby => "\n\n:arrow_forward: _**Pre-round lobby started**_\n",
                    GameRunLevel.InRound => "\n\n:arrow_forward: _**Round started**_\n",
@@ -413,26 +456,35 @@ namespace Content.Server.Administration.Systems
                        $"{_gameTicker.RunLevel} was not matched."),
                };

-                existingEmbed.lastRunLevel = _gameTicker.RunLevel;
+                existingEmbed.LastRunLevel = _gameTicker.RunLevel;
            }

+            // If last message of the new batch is SOS then relay it to on-call.
+            // ... as long as it hasn't been relayed already.
+            var discordMention = messages.Last();
+            var onCallRelay = !discordMention.Receivers && !existingEmbed.OnCall;
+
            // Add available messages to the embed description
            while (messages.TryDequeue(out var message))
            {
-                // In case someone thinks they're funny
-                if (message.Length > MessageLengthCap)
-                    message = message[..(MessageLengthCap - TooLongText.Length)] + TooLongText;
+                string text;

-                existingEmbed.description += $"\n{message}";
+                // In case someone thinks they're funny
+                if (message.Message.Length > MessageLengthCap)
+                    text = message.Message[..(MessageLengthCap - TooLongText.Length)] + TooLongText;
+                else
+                    text = message.Message;
+
+                existingEmbed.Description += $"\n{text}";
            }

-            var payload = GeneratePayload(existingEmbed.description,
-                existingEmbed.username,
-                existingEmbed.characterName);
+            var payload = GeneratePayload(existingEmbed.Description,
+                existingEmbed.Username,
+                existingEmbed.CharacterName);

            // If there is no existing embed, create a new one
            // Otherwise patch (edit) it
-            if (existingEmbed.id == null)
+            if (existingEmbed.Id == null)
            {
                var request = await _httpClient.PostAsync($"{_webhookUrl}?wait=true",
                    new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json"));
@@ -455,11 +507,11 @@ namespace Content.Server.Administration.Systems
                    return;
                }

-                existingEmbed.id = id.ToString();
+                existingEmbed.Id = id.ToString();
            }
            else
            {
-                var request = await _httpClient.PatchAsync($"{_webhookUrl}/messages/{existingEmbed.id}",
+                var request = await _httpClient.PatchAsync($"{_webhookUrl}/messages/{existingEmbed.Id}",
                    new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json"));

                if (!request.IsSuccessStatusCode)
@@ -474,6 +526,43 @@ namespace Content.Server.Administration.Systems

            _relayMessages[userId] = existingEmbed;

+            // Actually do the on call relay last, we just need to grab it before we dequeue every message above.
+            if (onCallRelay &&
+                _onCallData != null)
+            {
+                existingEmbed.OnCall = true;
+                var roleMention = _config.GetCVar(CCVars.DiscordAhelpMention);
+
+                if (!string.IsNullOrEmpty(roleMention))
+                {
+                    var message = new StringBuilder();
+                    message.AppendLine($"<@&{roleMention}>");
+                    message.AppendLine("Unanswered SOS");
+
+                    // Need webhook data to get the correct link for that channel rather than on-call data.
+                    if (_webhookData is { GuildId: { } guildId, ChannelId: { } channelId })
+                    {
+                        message.AppendLine(
+                            $"**[Go to ahelp](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.Id})**");
+                    }
+
+                    payload = GeneratePayload(message.ToString(), existingEmbed.Username, existingEmbed.CharacterName);
+
+                    var request = await _httpClient.PostAsync($"{_onCallUrl}?wait=true",
+                        new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json"));
+
+                    var content = await request.Content.ReadAsStringAsync();
+                    if (!request.IsSuccessStatusCode)
+                    {
+                        _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when posting relay message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}");
+                    }
+                }
+            }
+            else
+            {
+                existingEmbed.OnCall = false;
+            }
+
            _processingChannels.Remove(userId);
        }

@@ -652,7 +741,7 @@ namespace Content.Server.Administration.Systems
            if (sendsWebhook)
            {
                if (!_messageQueues.ContainsKey(msg.UserId))
-                    _messageQueues[msg.UserId] = new Queue<string>();
+                    _messageQueues[msg.UserId] = new Queue<DiscordRelayedData>();

                var str = message.Text;
                var unameLength = senderSession.Name.Length;
@@ -701,7 +790,7 @@ namespace Content.Server.Administration.Systems
                .ToList();
        }

-        private static string GenerateAHelpMessage(AHelpMessageParams parameters)
+        private static DiscordRelayedData GenerateAHelpMessage(AHelpMessageParams parameters)
        {
            var stringbuilder = new StringBuilder();

@@ -718,13 +807,57 @@ namespace Content.Server.Administration.Systems
                stringbuilder.Append($" **{parameters.RoundTime}**");
            if (!parameters.PlayedSound)
                stringbuilder.Append(" **(S)**");
-
            if (parameters.Icon == null)
                stringbuilder.Append($" **{parameters.Username}:** ");
            else
                stringbuilder.Append($" **{parameters.Username}** ");
            stringbuilder.Append(parameters.Message);
-            return stringbuilder.ToString();
+
+            return new DiscordRelayedData()
+            {
+                Receivers = !parameters.NoReceivers,
+                Message = stringbuilder.ToString(),
+            };
+        }
+
+        private record struct DiscordRelayedData
+        {
+            /// <summary>
+            /// Was anyone online to receive it.
+            /// </summary>
+            public bool Receivers;
+
+            /// <summary>
+            /// What's the payload to send to discord.
+            /// </summary>
+            public string Message;
+        }
+
+        /// <summary>
+        ///  Class specifically for holding information regarding existing Discord embeds
+        /// </summary>
+        private sealed class DiscordRelayInteraction
+        {
+            public string? Id;
+
+            public string Username = String.Empty;
+
+            public string? CharacterName;
+
+            /// <summary>
+            /// Contents for the discord message.
+            /// </summary>
+            public string Description = string.Empty;
+
+            /// <summary>
+            /// Run level of the last interaction. If different we'll link to the last Id.
+            /// </summary>
+            public GameRunLevel LastRunLevel;
+
+            /// <summary>
+            /// Did we relay this interaction to OnCall previously.
+            /// </summary>
+            public bool OnCall;
        }
    }

--- a/Content.Server/Ame/Components/AmeControllerComponent.cs
+++ b/Content.Server/Ame/Components/AmeControllerComponent.cs
@@ -55,7 +55,7 @@ public sealed partial class AmeControllerComponent : SharedAmeControllerComponen
    /// </summary>
    [DataField("injectSound")]
    [ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier InjectSound = new SoundCollectionSpecifier("MetalThud");
+    public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Machines/ame_fuelinjection.ogg");

    /// <summary>
    /// The last time this could have injected fuel into the AME.
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -680,7 +680,10 @@ public sealed class PlantHolderSystem : EntitySystem
            if (TryComp<HandsComponent>(user, out var hands))
            {
                if (!_botany.CanHarvest(component.Seed, hands.ActiveHandEntity))
+                {
+                    _popup.PopupCursor(Loc.GetString("plant-holder-component-ligneous-cant-harvest-message"), user);
                    return false;
+                }
            }
            else if (!_botany.CanHarvest(component.Seed))
            {
--- a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
+++ b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs
@@ -39,7 +39,7 @@ public sealed class ExaminableDamageSystem : EntitySystem

        var level = GetDamageLevel(uid, component);
        var msg = Loc.GetString(messages[level]);
-        args.PushMarkup(msg);
+        args.PushMarkup(msg,-99);
    }

    private int GetDamageLevel(EntityUid uid, ExaminableDamageComponent? component = null,
--- a/Content.Server/Doors/Systems/DoorSystem.cs
+++ b/Content.Server/Doors/Systems/DoorSystem.cs
@@ -46,8 +46,8 @@ public sealed class DoorSystem : SharedDoorSystem
                SetBoltsDown(ent, true);
        }

-        UpdateBoltLightStatus(ent);
        ent.Comp.Powered = args.Powered;
        Dirty(ent, ent.Comp);
+        UpdateBoltLightStatus(ent);
    }
 }
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -172,7 +172,8 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
    // TODO: AntagCodewordsComponent
    private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextPrependEvent args)
    {
-        args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", comp.Codewords)));
+        if(comp.GiveCodewords)
+            args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", comp.Codewords)));
    }

    // TODO: figure out how to handle this? add priority to briefing event?
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -49,12 +49,9 @@ namespace Content.Server.Nutrition.EntitySystems
                {
                    _puddle.TrySpillAt(uid, solution, out _, false);
                }
-                if (foodComp.Trash.Count == 0)
+                foreach (var trash in foodComp.Trash)
                {
-                    foreach (var trash in foodComp.Trash)
-                    {
-                        EntityManager.SpawnEntity(trash, Transform(uid).Coordinates);
-                    }
+                    EntityManager.SpawnEntity(trash, Transform(uid).Coordinates);
                }
            }
            ActivatePayload(uid);
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -10,6 +10,7 @@ using Content.Server.Shuttles.Events;
 using Content.Server.Shuttles.Systems;
 using Content.Shared.Atmos;
 using Content.Shared.Decals;
+using Content.Shared.Ghost;
 using Content.Shared.Gravity;
 using Content.Shared.Parallax.Biomes;
 using Content.Shared.Parallax.Biomes.Layers;
@@ -51,6 +52,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem

    private EntityQuery<BiomeComponent> _biomeQuery;
    private EntityQuery<FixturesComponent> _fixturesQuery;
+    private EntityQuery<GhostComponent> _ghostQuery;
    private EntityQuery<TransformComponent> _xformQuery;

    private readonly HashSet<EntityUid> _handledEntities = new();
@@ -81,6 +83,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
        Log.Level = LogLevel.Debug;
        _biomeQuery = GetEntityQuery<BiomeComponent>();
        _fixturesQuery = GetEntityQuery<FixturesComponent>();
+        _ghostQuery = GetEntityQuery<GhostComponent>();
        _xformQuery = GetEntityQuery<TransformComponent>();
        SubscribeLocalEvent<BiomeComponent, MapInitEvent>(OnBiomeMapInit);
        SubscribeLocalEvent<FTLStartedEvent>(OnFTLStarted);
@@ -315,6 +318,11 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
        }
    }

+    private bool CanLoad(EntityUid uid)
+    {
+        return !_ghostQuery.HasComp(uid);
+    }
+
    public override void Update(float frameTime)
    {
        base.Update(frameTime);
@@ -332,7 +340,8 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
            if (_xformQuery.TryGetComponent(pSession.AttachedEntity, out var xform) &&
                _handledEntities.Add(pSession.AttachedEntity.Value) &&
                 _biomeQuery.TryGetComponent(xform.MapUid, out var biome) &&
-                biome.Enabled)
+                biome.Enabled &&
+                CanLoad(pSession.AttachedEntity.Value))
            {
                var worldPos = _transform.GetWorldPosition(xform);
                AddChunksInRange(biome, worldPos);
@@ -349,7 +358,8 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
                if (!_handledEntities.Add(viewer) ||
                    !_xformQuery.TryGetComponent(viewer, out xform) ||
                    !_biomeQuery.TryGetComponent(xform.MapUid, out biome) ||
-                    !biome.Enabled)
+                    !biome.Enabled ||
+                    !CanLoad(viewer))
                {
                    continue;
                }
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -30,7 +30,7 @@ public sealed class RadioDeviceSystem : EntitySystem
    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;

    // Used to prevent a shitter from using a bunch of radios to spam chat.
-    private HashSet<(string, EntityUid)> _recentlySent = new();
+    private HashSet<(string, EntityUid, RadioChannelPrototype)> _recentlySent = new();

    public override void Initialize()
    {
@@ -114,7 +114,7 @@ public sealed class RadioDeviceSystem : EntitySystem
    {
        if (args.Powered)
            return;
-        SetMicrophoneEnabled(uid, null, false,  true, component);
+        SetMicrophoneEnabled(uid, null, false, true, component);
    }

    public void SetMicrophoneEnabled(EntityUid uid, EntityUid? user, bool enabled, bool quiet = false, RadioMicrophoneComponent? component = null)
@@ -191,8 +191,9 @@ public sealed class RadioDeviceSystem : EntitySystem
        if (HasComp<RadioSpeakerComponent>(args.Source))
            return; // no feedback loops please.

-        if (_recentlySent.Add((args.Message, args.Source)))
-            _radio.SendRadioMessage(args.Source, args.Message, _protoMan.Index<RadioChannelPrototype>(component.BroadcastChannel), uid);
+        var channel = _protoMan.Index<RadioChannelPrototype>(component.BroadcastChannel)!;
+        if (_recentlySent.Add((args.Message, args.Source, channel)))
+            _radio.SendRadioMessage(args.Source, args.Message, channel, uid);
    }

    private void OnAttemptListen(EntityUid uid, RadioMicrophoneComponent component, ListenAttemptEvent args)
@@ -279,7 +280,7 @@ public sealed class RadioDeviceSystem : EntitySystem
        if (TryComp<RadioMicrophoneComponent>(ent, out var mic))
            mic.BroadcastChannel = channel;
        if (TryComp<RadioSpeakerComponent>(ent, out var speaker))
-            speaker.Channels = new(){ channel };
+            speaker.Channels = new() { channel };
        Dirty(ent);
    }
 }
--- a/Content.Server/Silicons/Laws/SiliconLawEui.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawEui.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
@@ -52,8 +52,8 @@ public sealed class SiliconLawEui : BaseEui
            return;

        var player = _entityManager.GetEntity(message.Target);
-
-        _siliconLawSystem.SetLaws(message.Laws, player);
+        if (_entityManager.TryGetComponent<SiliconLawProviderComponent>(player, out var playerProviderComp))
+            _siliconLawSystem.SetLaws(message.Laws, player, playerProviderComp.LawUploadSound);
    }

    private bool IsAllowed()
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -21,6 +21,8 @@ using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;

 namespace Content.Server.Silicons.Laws;

@@ -113,7 +115,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
            component.Lawset = args.Lawset;

            // gotta tell player to check their laws
-            NotifyLawsChanged(uid);
+            NotifyLawsChanged(uid, component.LawUploadSound);

            // new laws may allow antagonist behaviour so make it clear for admins
            if (TryComp<EmagSiliconLawComponent>(uid, out var emag))
@@ -149,14 +151,11 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
            return;

        base.OnGotEmagged(uid, component, ref args);
-        NotifyLawsChanged(uid);
+        NotifyLawsChanged(uid, component.EmaggedSound);
        EnsureEmaggedRole(uid, component);

        _stunSystem.TryParalyze(uid, component.StunTime, true);

-        if (!_mind.TryGetMind(uid, out var mindId, out _))
-            return;
-        _roles.MindPlaySound(mindId, component.EmaggedSound);
    }

    private void OnEmagMindAdded(EntityUid uid, EmagSiliconLawComponent component, MindAddedMessage args)
@@ -237,7 +236,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
        return ev.Laws;
    }

-    public void NotifyLawsChanged(EntityUid uid)
+    public void NotifyLawsChanged(EntityUid uid, SoundSpecifier? cue = null)
    {
        if (!TryComp<ActorComponent>(uid, out var actor))
            return;
@@ -245,6 +244,9 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
        var msg = Loc.GetString("laws-update-notify");
        var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
        _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Red);
+
+        if (cue != null && _mind.TryGetMind(uid, out var mindId, out _))
+            _roles.MindPlaySound(mindId, cue);
    }

    /// <summary>
@@ -269,7 +271,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
    /// <summary>
    /// Set the laws of a silicon entity while notifying the player.
    /// </summary>
-    public void SetLaws(List<SiliconLaw> newLaws, EntityUid target)
+    public void SetLaws(List<SiliconLaw> newLaws, EntityUid target, SoundSpecifier? cue = null)
    {
        if (!TryComp<SiliconLawProviderComponent>(target, out var component))
            return;
@@ -278,7 +280,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
            component.Lawset = new SiliconLawset();

        component.Lawset.Laws = newLaws;
-        NotifyLawsChanged(target);
+        NotifyLawsChanged(target, cue);
    }

    protected override void OnUpdaterInsert(Entity<SiliconLawUpdaterComponent> ent, ref EntInsertedIntoContainerMessage args)
@@ -292,9 +294,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem

        while (query.MoveNext(out var update))
        {
-            SetLaws(lawset, update);
-            if (provider.LawUploadSound != null && _mind.TryGetMind(update, out var mindId, out _))
-                _roles.MindPlaySound(mindId, provider.LawUploadSound);
+            SetLaws(lawset, update, provider.LawUploadSound);
        }
    }
 }
--- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
+++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -32,6 +32,7 @@ namespace Content.Server.Voting.Managers

        private VotingSystem? _votingSystem;
        private RoleSystem? _roleSystem;
+        private GameTicker? _gameTicker;

        private static readonly Dictionary<StandardVoteType, CVarDef<bool>> _voteTypesToEnableCVars = new()
        {
@@ -70,8 +71,8 @@ namespace Content.Server.Voting.Managers
                default:
                    throw new ArgumentOutOfRangeException(nameof(voteType), voteType, null);
            }
-            var ticker = _entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
-            ticker.UpdateInfoText();
+            _gameTicker = _entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
+            _gameTicker.UpdateInfoText();
            if (timeoutVote)
                TimeoutStandardVote(voteType);
        }
@@ -346,8 +347,14 @@ namespace Content.Server.Voting.Managers
                return;
            }

+
+
+            var voterEligibility = _cfg.GetCVar(CCVars.VotekickVoterGhostRequirement) ? VoterEligibility.GhostMinimumPlaytime : VoterEligibility.MinimumPlaytime;
+            if (_cfg.GetCVar(CCVars.VotekickIgnoreGhostReqInLobby) && _gameTicker!.RunLevel == GameRunLevel.PreRoundLobby)
+                voterEligibility = VoterEligibility.MinimumPlaytime;
+
            var eligibleVoterNumberRequirement = _cfg.GetCVar(CCVars.VotekickEligibleNumberRequirement);
-            var eligibleVoterNumber = _cfg.GetCVar(CCVars.VotekickVoterGhostRequirement) ? CalculateEligibleVoterNumber(VoterEligibility.GhostMinimumPlaytime) : CalculateEligibleVoterNumber(VoterEligibility.MinimumPlaytime);
+            var eligibleVoterNumber = CalculateEligibleVoterNumber(voterEligibility);

            string target = args[0];
            string reason = args[1];
@@ -441,7 +448,7 @@ namespace Content.Server.Voting.Managers
                },
                Duration = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VotekickTimer)),
                InitiatorTimeout = TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.VotekickTimeout)),
-                VoterEligibility = _cfg.GetCVar(CCVars.VotekickVoterGhostRequirement) ? VoterEligibility.GhostMinimumPlaytime : VoterEligibility.MinimumPlaytime,
+                VoterEligibility = voterEligibility,
                DisplayVotes = false,
                TargetEntity = targetNetEntity
            };
--- a/Content.Server/Voting/Managers/VoteManager.cs
+++ b/Content.Server/Voting/Managers/VoteManager.cs
@@ -24,7 +24,6 @@ using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;

-
 namespace Content.Server.Voting.Managers
 {
    public sealed partial class VoteManager : IVoteManager
@@ -40,7 +39,7 @@ namespace Content.Server.Voting.Managers
        [Dependency] private readonly IGameMapManager _gameMapManager = default!;
        [Dependency] private readonly IEntityManager _entityManager = default!;
        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!; 
+        [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!;

        private int _nextVoteId = 1;

@@ -282,7 +281,7 @@ namespace Content.Server.Voting.Managers
            }

            // Admin always see the vote count, even if the vote is set to hide it.
-            if (_adminMgr.HasAdminFlag(player, AdminFlags.Moderator))
+            if (v.DisplayVotes || _adminMgr.HasAdminFlag(player, AdminFlags.Moderator))
            {
                msg.DisplayVotes = true;
            }
--- a/Content.Server/Voting/VotingSystem.cs
+++ b/Content.Server/Voting/VotingSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Database;
+using Content.Server.GameTicking;
 using Content.Server.Ghost;
 using Content.Server.Roles.Jobs;
 using Content.Shared.CCVar;
@@ -12,6 +13,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using System.Threading.Tasks;
+using Content.Shared.Players.PlayTimeTracking;

 namespace Content.Server.Voting;

@@ -24,6 +26,8 @@ public sealed class VotingSystem : EntitySystem
    [Dependency] private readonly IGameTiming _gameTiming = default!;
    [Dependency] private readonly IConfigurationManager _cfg = default!;
    [Dependency] private readonly JobSystem _jobs = default!;
+    [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!;

    public override void Initialize()
    {
@@ -34,8 +38,7 @@ public sealed class VotingSystem : EntitySystem

    private async void OnVotePlayerListRequestEvent(VotePlayerListRequestEvent msg, EntitySessionEventArgs args)
    {
-        if (args.SenderSession.AttachedEntity is not { Valid: true } entity
-            || !await CheckVotekickInitEligibility(args.SenderSession))
+        if (!await CheckVotekickInitEligibility(args.SenderSession))
        {
            var deniedResponse = new VotePlayerListResponseEvent(new (NetUserId, NetEntity, string)[0], true);
            RaiseNetworkEvent(deniedResponse, args.SenderSession.Channel);
@@ -46,17 +49,23 @@ public sealed class VotingSystem : EntitySystem

        foreach (var player in _playerManager.Sessions)
        {
-            if (player.AttachedEntity is not { Valid: true } attached)
-                continue;
-
-            if (attached == entity) continue;
+            if (args.SenderSession == player) continue;

            if (_adminManager.IsAdmin(player, false)) continue;

-            var playerName = GetPlayerVoteListName(attached);
-            var netEntity = GetNetEntity(attached);
+            if (player.AttachedEntity is not { Valid: true } attached)
+            {
+                var playerName = player.Name;
+                var netEntity = NetEntity.Invalid;
+                players.Add((player.UserId, netEntity, playerName));
+            }
+            else
+            {
+                var playerName = GetPlayerVoteListName(attached);
+                var netEntity = GetNetEntity(attached);

-            players.Add((player.UserId, netEntity, playerName));
+                players.Add((player.UserId, netEntity, playerName));
+            }
        }

        var response = new VotePlayerListResponseEvent(players.ToArray(), false);
@@ -86,22 +95,29 @@ public sealed class VotingSystem : EntitySystem
        if (initiator.AttachedEntity != null && _adminManager.IsAdmin(initiator.AttachedEntity.Value, false))
            return true;

-        if (_cfg.GetCVar(CCVars.VotekickInitiatorGhostRequirement))
+        // If cvar enabled, skip the ghost requirement in the preround lobby
+        if (!_cfg.GetCVar(CCVars.VotekickIgnoreGhostReqInLobby) || (_cfg.GetCVar(CCVars.VotekickIgnoreGhostReqInLobby) && _gameTicker.RunLevel != GameRunLevel.PreRoundLobby))
        {
-            // Must be ghost
-            if (!TryComp(initiator.AttachedEntity, out GhostComponent? ghostComp))
-                return false;
+            if (_cfg.GetCVar(CCVars.VotekickInitiatorGhostRequirement))
+            {
+                // Must be ghost
+                if (!TryComp(initiator.AttachedEntity, out GhostComponent? ghostComp))
+                    return false;

-            // Must have been dead for x seconds
-            if ((int)_gameTiming.RealTime.Subtract(ghostComp.TimeOfDeath).TotalSeconds < _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime))
-                return false;
+                // Must have been dead for x seconds
+                if ((int)_gameTiming.RealTime.Subtract(ghostComp.TimeOfDeath).TotalSeconds < _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime))
+                    return false;
+            }
        }

        // Must be whitelisted
-        if (!await _dbManager.GetWhitelistStatusAsync(initiator.UserId))
+        if (!await _dbManager.GetWhitelistStatusAsync(initiator.UserId) && _cfg.GetCVar(CCVars.VotekickInitiatorWhitelistedRequirement))
            return false;

-        return true;
+        // Must be eligible to vote
+        var playtime = _playtimeManager.GetPlayTimes(initiator);
+        return playtime.TryGetValue(PlayTimeTrackingShared.TrackerOverall, out TimeSpan overallTime) && (overallTime >= TimeSpan.FromHours(_cfg.GetCVar(CCVars.VotekickEligibleVoterPlaytime))
+            || !_cfg.GetCVar(CCVars.VotekickInitiatorTimeRequirement));
    }

    /// <summary>