[Tweak] Upstream sync

.envrc

@@ -1,4 +1,5 @@
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
+set -e
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
 fi
 use flake

Content.Client/Chat/UI/EmotesMenu.xaml

@@ -1,4 +1,4 @@
-<ui:RadialMenu xmlns="https://spacestation14.io"
+<ui:RadialMenu xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
                 BackButtonStyleClass="RadialMenuBackButton"
                 CloseButtonStyleClass="RadialMenuCloseButton"
@@ -7,25 +7,25 @@
                 MinSize="450 450">
 
     <!-- Main -->
-    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" Radius="64" ReserveSpaceForHiddenChildren="False">
-        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-general'}" TargetLayer="General" Visible="False">
+    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" InitialRadius="100" ReserveSpaceForHiddenChildren="False">
+        <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-general'}" TargetLayer="General" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png"/>
-        </ui:RadialMenuTextureButton>
-        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-vocal'}" TargetLayer="Vocal" Visible="False">
+        </ui:RadialMenuTextureButtonWithSector>
+        <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-vocal'}" TargetLayer="Vocal" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Emotes/vocal.png"/>
-        </ui:RadialMenuTextureButton>
-        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
+        </ui:RadialMenuTextureButtonWithSector>
+        <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png"/>
-        </ui:RadialMenuTextureButton>
+        </ui:RadialMenuTextureButtonWithSector>
     </ui:RadialContainer>
 
     <!-- General -->
-    <ui:RadialContainer Name="General"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+    <ui:RadialContainer Name="General"  VerticalExpand="True" HorizontalExpand="True" InitialRadius="100"/>
 
     <!-- Vocal -->
-    <ui:RadialContainer Name="Vocal"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+    <ui:RadialContainer Name="Vocal"  VerticalExpand="True" HorizontalExpand="True" InitialRadius="100"/>
 
     <!-- Hands -->
-    <ui:RadialContainer Name="Hands"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+    <ui:RadialContainer Name="Hands"  VerticalExpand="True" HorizontalExpand="True" InitialRadius="100"/>
 
 </ui:RadialMenu>

Content.Client/Chat/UI/EmotesMenu.xaml.cs

@@ -50,7 +50,6 @@ public EmotesMenu()
 
             var button = new EmoteMenuButton
             {
-                StyleClasses = { "RadialMenuButton" },
                 SetSize = new Vector2(64f, 64f),
                 ToolTip = Loc.GetString(emote.Name),
                 ProtoId = emote.ID,
@@ -106,7 +105,7 @@ private void AddEmoteClickAction(RadialContainer container)
 }
 
 
-public sealed class EmoteMenuButton : RadialMenuTextureButton
+public sealed class EmoteMenuButton : RadialMenuTextureButtonWithSector
 {
     public ProtoId<EmotePrototype> ProtoId { get; set; }
 }

Content.Client/CrewManifest/UI/CrewManifestSection.cs

@@ -22,7 +22,7 @@ public CrewManifestSection(
         AddChild(new Label()
         {
             StyleClasses = { "LabelBig" },
-            Text = Loc.GetString($"department-{section.ID}")
+            Text = Loc.GetString(section.Name)
         });
 
         var gridContainer = new GridContainer()

Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs

@@ -51,7 +51,6 @@ private void RefreshUI()
 
             var button = new GhostRoleRadioMenuButton()
             {
-                StyleClasses = { "RadialMenuButton" },
                 SetSize = new Vector2(64, 64),
                 ToolTip = Loc.GetString(ghostRoleProto.Name),
                 ProtoId = ghostRoleProto.ID,
@@ -100,7 +99,7 @@ private void AddGhostRoleRadioMenuButtonOnClickActions(Control control)
     }
 }
 
-public sealed class GhostRoleRadioMenuButton : RadialMenuTextureButton
+public sealed class GhostRoleRadioMenuButton : RadialMenuTextureButtonWithSector
 {
     public ProtoId<GhostRolePrototype> ProtoId { get; set; }
 }

Content.Client/Holopad/HolopadSystem.cs

@@ -2,45 +2,38 @@
 using Content.Shared.Holopad;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
-using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using System.Linq;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Holopad;
 
 public sealed class HolopadSystem : SharedHolopadSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<HolopadHologramComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<HolopadHologramComponent, ComponentStartup>(OnComponentStartup);
         SubscribeLocalEvent<HolopadHologramComponent, BeforePostShaderRenderEvent>(OnShaderRender);
         SubscribeAllEvent<TypingChangedEvent>(OnTypingChanged);
-
-        SubscribeNetworkEvent<PlayerSpriteStateRequest>(OnPlayerSpriteStateRequest);
-        SubscribeNetworkEvent<PlayerSpriteStateMessage>(OnPlayerSpriteStateMessage);
     }
 
-    private void OnComponentInit(EntityUid uid, HolopadHologramComponent component, ComponentInit ev)
+    private void OnComponentStartup(Entity<HolopadHologramComponent> entity, ref ComponentStartup ev)
     {
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
-            return;
-
-        UpdateHologramSprite(uid);
+        UpdateHologramSprite(entity, entity.Comp.LinkedEntity);
     }
 
-    private void OnShaderRender(EntityUid uid, HolopadHologramComponent component, BeforePostShaderRenderEvent ev)
+    private void OnShaderRender(Entity<HolopadHologramComponent> entity, ref BeforePostShaderRenderEvent ev)
     {
         if (ev.Sprite.PostShader == null)
             return;
 
-        ev.Sprite.PostShader.SetParameter("t", (float)_timing.CurTime.TotalSeconds * component.ScrollRate);
+        UpdateHologramSprite(entity, entity.Comp.LinkedEntity);
     }
 
     private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
@@ -57,100 +50,66 @@ private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
         RaiseNetworkEvent(netEv);
     }
 
-    private void OnPlayerSpriteStateRequest(PlayerSpriteStateRequest ev)
+    private void UpdateHologramSprite(EntityUid hologram, EntityUid? target)
     {
-        var targetPlayer = GetEntity(ev.TargetPlayer);
-        var player = _playerManager.LocalSession?.AttachedEntity;
-
-        // Ignore the request if received by a player who isn't the target
-        if (targetPlayer != player)
+        // Get required components
+        if (!TryComp<SpriteComponent>(hologram, out var hologramSprite) ||
+            !TryComp<HolopadHologramComponent>(hologram, out var holopadhologram))
             return;
 
-        if (!TryComp<SpriteComponent>(player, out var playerSprite))
-            return;
-
-        var spriteLayerData = new List<PrototypeLayerData>();
+        // Remove all sprite layers
+        for (int i = hologramSprite.AllLayers.Count() - 1; i >= 0; i--)
+            hologramSprite.RemoveLayer(i);
 
-        if (playerSprite.Visible)
+        if (TryComp<SpriteComponent>(target, out var targetSprite))
         {
-            // Record the RSI paths, state names and shader paramaters of all visible layers
-            for (int i = 0; i < playerSprite.AllLayers.Count(); i++)
+            // Use the target's holographic avatar (if available)
+            if (TryComp<HolographicAvatarComponent>(target, out var targetAvatar) &&
+                targetAvatar.LayerData != null)
             {
-                if (!playerSprite.TryGetLayer(i, out var layer))
-                    continue;
-
-                if (!layer.Visible ||
-                    string.IsNullOrEmpty(layer.ActualRsi?.Path.ToString()) ||
-                    string.IsNullOrEmpty(layer.State.Name))
-                    continue;
-
-                var layerDatum = new PrototypeLayerData();
-                layerDatum.RsiPath = layer.ActualRsi.Path.ToString();
-                layerDatum.State = layer.State.Name;
-
-                if (layer.CopyToShaderParameters != null)
+                for (int i = 0; i < targetAvatar.LayerData.Length; i++)
                 {
-                    var key = (string)layer.CopyToShaderParameters.LayerKey;
-
-                    if (playerSprite.LayerMapTryGet(key, out var otherLayerIdx) &&
-                        playerSprite.TryGetLayer(otherLayerIdx, out var otherLayer) &&
-                        otherLayer.Visible)
-                    {
-                        layerDatum.MapKeys = new() { key };
-
-                        layerDatum.CopyToShaderParameters = new PrototypeCopyToShaderParameters()
-                        {
-                            LayerKey = key,
-                            ParameterTexture = layer.CopyToShaderParameters.ParameterTexture,
-                            ParameterUV = layer.CopyToShaderParameters.ParameterUV
-                        };
-                    }
+                    var layer = targetAvatar.LayerData[i];
+                    hologramSprite.AddLayer(targetAvatar.LayerData[i], i);
                 }
+            }
 
-                spriteLayerData.Add(layerDatum);
+            // Otherwise copy the target's current physical appearance
+            else
+            {
+                hologramSprite.CopyFrom(targetSprite);
             }
         }
 
-        // Return the recorded data to the server
-        var evResponse = new PlayerSpriteStateMessage(ev.TargetPlayer, spriteLayerData.ToArray());
-        RaiseNetworkEvent(evResponse);
-    }
-
-    private void OnPlayerSpriteStateMessage(PlayerSpriteStateMessage ev)
-    {
-        UpdateHologramSprite(GetEntity(ev.SpriteEntity), ev.SpriteLayerData);
-    }
-
-    private void UpdateHologramSprite(EntityUid uid, PrototypeLayerData[]? layerData = null)
-    {
-        if (!TryComp<SpriteComponent>(uid, out var hologramSprite))
-            return;
-
-        if (!TryComp<HolopadHologramComponent>(uid, out var holopadhologram))
-            return;
+        // There is no target, display a default sprite instead (if available)
+        else
+        {
+            if (string.IsNullOrEmpty(holopadhologram.RsiPath) || string.IsNullOrEmpty(holopadhologram.RsiState))
+                return;
 
-        for (int i = hologramSprite.AllLayers.Count() - 1; i >= 0; i--)
-            hologramSprite.RemoveLayer(i);
+            var layer = new PrototypeLayerData();
+            layer.RsiPath = holopadhologram.RsiPath;
+            layer.State = holopadhologram.RsiState;
 
-        if (layerData == null || layerData.Length == 0)
-        {
-            layerData = new PrototypeLayerData[1];
-            layerData[0] = new PrototypeLayerData()
-            {
-                RsiPath = holopadhologram.RsiPath,
-                State = holopadhologram.RsiState
-            };
+            hologramSprite.AddLayer(layer);
         }
 
-        for (int i = 0; i < layerData.Length; i++)
-        {
-            var layer = layerData[i];
-            layer.Shader = "unshaded";
+        // Override specific values
+        hologramSprite.Color = Color.White;
+        hologramSprite.Offset = holopadhologram.Offset;
+        hologramSprite.DrawDepth = (int)DrawDepth.Mobs;
+        hologramSprite.NoRotation = true;
+        hologramSprite.DirectionOverride = Direction.South;
+        hologramSprite.EnableDirectionOverride = true;
 
-            hologramSprite.AddLayer(layerData[i], i);
+        // Remove shading from all layers (except displacement maps)
+        for (int i = 0; i < hologramSprite.AllLayers.Count(); i++)
+        {
+            if (hologramSprite.TryGetLayer(i, out var layer) && layer.ShaderPrototype != "DisplacedStencilDraw")
+                hologramSprite.LayerSetShader(i, "unshaded");
         }
 
-        UpdateHologramShader(uid, hologramSprite, holopadhologram);
+        UpdateHologramShader(hologram, hologramSprite, holopadhologram);
     }
 
     private void UpdateHologramShader(EntityUid uid, SpriteComponent sprite, HolopadHologramComponent holopadHologram)

Content.Client/LateJoin/LateJoinGui.cs

@@ -172,7 +172,7 @@ private void RebuildUI()
 
                 foreach (var department in departments)
                 {
-                    var departmentName = Loc.GetString($"department-{department.ID}");
+                    var departmentName = Loc.GetString(department.Name);
                     _jobCategories[id] = new Dictionary<string, BoxContainer>();
                     var stationAvailable = _gameTicker.JobsAvailable[id];
                     var jobsAvailable = new List<JobPrototype>();

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -892,7 +892,7 @@ public void RefreshJobs()
 
             foreach (var department in departments)
             {
-                var departmentName = Loc.GetString($"department-{department.ID}");
+                var departmentName = Loc.GetString(department.Name);
 
                 if (!_jobCategories.TryGetValue(department.ID, out var category))
                 {

Content.Client/Options/UI/Tabs/AudioTab.xaml

@@ -23,6 +23,7 @@
                 <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
                 <CheckBox Name="EventMusicCheckBox" Text="{Loc 'ui-options-event-music'}" />
                 <CheckBox Name="AdminSoundsCheckBox" Text="{Loc 'ui-options-admin-sounds'}" />
+                <CheckBox Name="BwoinkSoundCheckBox" Text="{Loc 'ui-options-bwoink-sound'}" />
             </BoxContainer>
         </BoxContainer>
         <ui:OptionsTabControlRow Name="Control" Access="Public" />

Content.Client/Options/UI/Tabs/AudioTab.xaml.cs

@@ -1,3 +1,4 @@
+using Content.Client.Administration.Managers;
 using Content.Client.Audio;
 using Content.Shared.CCVar;
 using Content.Shared.Corvax.CCCVars;
@@ -13,8 +14,9 @@ namespace Content.Client.Options.UI.Tabs;
 [GenerateTypedNameReferences]
 public sealed partial class AudioTab : Control
 {
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IAudioManager _audio = default!;
+    [Dependency] private readonly IClientAdminManager _admin = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     public AudioTab()
     {
@@ -79,10 +81,30 @@ public AudioTab()
         Control.AddOptionCheckBox(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox);
         Control.AddOptionCheckBox(CCVars.EventMusicEnabled, EventMusicCheckBox);
         Control.AddOptionCheckBox(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox);
+        Control.AddOptionCheckBox(CCVars.BwoinkSoundEnabled, BwoinkSoundCheckBox);
 
         Control.Initialize();
     }
 
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+        _admin.AdminStatusUpdated += UpdateAdminButtonsVisibility;
+        UpdateAdminButtonsVisibility();
+    }
+
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+        _admin.AdminStatusUpdated -= UpdateAdminButtonsVisibility;
+    }
+
+
+    private void UpdateAdminButtonsVisibility()
+    {
+        BwoinkSoundCheckBox.Visible = _admin.IsActive();
+    }
+
     private void OnMasterVolumeSliderChanged(float value)
     {
         // TODO: I was thinking of giving OptionsTabControlRow a flag to "set CVar immediately", but I'm deferring that