Merge branch 'master' into USSP-ID-PDA

.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/Audio/ContentAudioSystem.LobbyMusic.cs

@@ -227,7 +227,7 @@ private void PlayRestartSound(RoundRestartCleanupEvent ev)
             file,
             Filter.Local(),
             false,
-            _roundEndSoundEffectParams.WithVolume(10f) // Sunrise-Edit
+            _roundEndSoundEffectParams.WithVolume(-3f) // Sunrise-Edit
         )?.Entity;
     }
 

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.Server/Ghost/Roles/Components/ToggleableGhostRoleComponent.cs

@@ -55,7 +55,7 @@ public sealed partial class ToggleableGhostRoleComponent : Component
     /// A list of mind roles that will be added to the entity's mind
     /// </summary>
     [DataField]
-    public List<EntProtoId> MindRoles;
+    public List<EntProtoId> MindRoles = new() { "MindRoleGhostRoleNeutral" };
 
     /// <summary>
     /// The displayed name of the verb to wipe the controlling player