Merge branch 'master' into dv-ipc

Simple-Station · Aug 21, 2024 · 78cd087 · 78cd087
2 parents 2c6ef82 + b64b0ab
commit 78cd087
Show file tree

Hide file tree

Showing 349 changed files with 8,353 additions and 5,368 deletions.
diff --git a/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs b/Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
@@ -58,7 +58,7 @@ await _pair.Server.WaitPost(() =>
             for (var i = 0; i < N; i++)
             {
                 _entity = server.EntMan.SpawnAttachedTo(Mob, _coords);
-                _spawnSys.EquipStartingGear(_entity, _gear);
+                _spawnSys.EquipStartingGear(_entity, _gear, null);
                 server.EntMan.DeleteEntity(_entity);
             }
         });

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -118,11 +118,8 @@ private void SetLayerData(
     ///     This should not be used if the entity is owned by the server. The server will otherwise
     ///     override this with the appearance data it sends over.
     /// </remarks>
-    public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profile, HumanoidAppearanceComponent? humanoid = null)
+    public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile, HumanoidAppearanceComponent? humanoid = null)
     {
-        if (profile == null)
-            return;
-
         if (!Resolve(uid, ref humanoid))
         {
             return;

diff --git a/.../Nyanotrasen/Overlays/DogVisionOverlay.cs → Content.Client/Overlays/DogVisionOverlay.cs b/.../Nyanotrasen/Overlays/DogVisionOverlay.cs → Content.Client/Overlays/DogVisionOverlay.cs
@@ -2,9 +2,9 @@
 using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
-using Content.Shared.Abilities;
+using Content.Shared.Traits.Assorted.Components;
 
-namespace Content.Client.Nyanotrasen.Overlays;
+namespace Content.Client.Overlays;
 
 public sealed partial class DogVisionOverlay : Overlay
 {
@@ -23,22 +23,27 @@ public DogVisionOverlay()
         _dogVisionShader = _prototypeManager.Index<ShaderPrototype>("DogVision").Instance().Duplicate();
     }
 
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (_playerManager.LocalEntity is not { Valid: true } player
+            || !_entityManager.HasComponent<DogVisionComponent>(player))
+            return false;
+
+        return base.BeforeDraw(in args);
+    }
+
     protected override void Draw(in OverlayDrawArgs args)
     {
-        if (ScreenTexture == null)
+        if (ScreenTexture is null)
             return;
-        if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
-            return;
-        if (!_entityManager.HasComponent<DogVisionComponent>(player))
-            return;
-
-        _dogVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
+        _dogVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
         var worldHandle = args.WorldHandle;
         var viewport = args.WorldBounds;
         worldHandle.SetTransform(Matrix3.Identity);
         worldHandle.UseShader(_dogVisionShader);
         worldHandle.DrawRect(viewport, Color.White);
+        worldHandle.UseShader(null);
     }
 }
diff --git a/...t/Nyanotrasen/Overlays/DogVisionSystem.cs → Content.Client/Overlays/DogVisionSystem.cs b/...t/Nyanotrasen/Overlays/DogVisionSystem.cs → Content.Client/Overlays/DogVisionSystem.cs
@@ -1,14 +1,16 @@
-using Content.Shared.Abilities;
+using Content.Shared.Traits.Assorted.Components;
 using Content.Shared.DeltaV.CCVars;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
+using Robust.Shared.Player;
 
-namespace Content.Client.Nyanotrasen.Overlays;
+namespace Content.Client.Overlays;
 
 public sealed partial class DogVisionSystem : EntitySystem
 {
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
 
     private DogVisionOverlay _overlay = default!;
 
@@ -18,6 +20,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<DogVisionComponent, ComponentInit>(OnDogVisionInit);
         SubscribeLocalEvent<DogVisionComponent, ComponentShutdown>(OnDogVisionShutdown);
+        SubscribeLocalEvent<DogVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<DogVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
 
         Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
 
@@ -26,11 +30,28 @@ public override void Initialize()
 
     private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
     {
+        if (uid != _playerMan.LocalEntity)
+            return;
+
         if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
+    {
+        if (uid != _playerMan.LocalEntity)
+            return;
+
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
+    {
+        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
     {
         _overlayMan.RemoveOverlay(_overlay);
     }

diff --git a/Content.Client/Overlays/SaturationScaleOverlay.cs b/Content.Client/Overlays/SaturationScaleOverlay.cs
@@ -0,0 +1,53 @@
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Mood;
+using Content.Shared.Overlays;
+
+namespace Content.Client.Overlays;
+
+public sealed class SaturationScaleOverlay : Overlay
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] IEntityManager _entityManager = default!;
+
+    public override bool RequestScreenTexture => true;
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    private readonly ShaderInstance _shader;
+    private const float Saturation = 0.5f;
+
+
+    public SaturationScaleOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+
+        _shader = _prototypeManager.Index<ShaderPrototype>("SaturationScale").Instance().Duplicate();
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (_playerManager.LocalEntity is not { Valid: true } player
+            || !_entityManager.HasComponent<SaturationScaleOverlayComponent>(player))
+            return false;
+
+        return base.BeforeDraw(in args);
+    }
+
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture is null)
+            return;
+
+        _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _shader.SetParameter("saturation", Saturation);
+
+        var handle = args.WorldHandle;
+        handle.SetTransform(Matrix3.Identity);
+        handle.UseShader(_shader);
+        handle.DrawRect(args.WorldBounds, Color.White);
+        handle.UseShader(null);
+    }
+}
diff --git a/Content.Client/Overlays/SaturationScaleSystem.cs b/Content.Client/Overlays/SaturationScaleSystem.cs
@@ -0,0 +1,63 @@
+using Content.Shared.GameTicking;
+using Content.Shared.Mood;
+using Content.Shared.Overlays;
+using Robust.Client.Graphics;
+using Robust.Shared.Player;
+
+namespace Content.Client.Overlays;
+
+public sealed class SaturationScaleSystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
+
+    private SaturationScaleOverlay _overlay = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _overlay = new();
+
+        SubscribeLocalEvent<SaturationScaleOverlayComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<SaturationScaleOverlayComponent, ComponentShutdown>(OnShutdown);
+
+        SubscribeLocalEvent<SaturationScaleOverlayComponent, PlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<SaturationScaleOverlayComponent, PlayerDetachedEvent>(OnPlayerDetached);
+
+        SubscribeNetworkEvent<RoundRestartCleanupEvent>(RoundRestartCleanup);
+    }
+
+
+    private void RoundRestartCleanup(RoundRestartCleanupEvent ev)
+    {
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, SaturationScaleOverlayComponent component, PlayerDetachedEvent args)
+    {
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnPlayerAttached(EntityUid uid, SaturationScaleOverlayComponent component, PlayerAttachedEvent args)
+    {
+        _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnShutdown(EntityUid uid, SaturationScaleOverlayComponent component, ComponentShutdown args)
+    {
+        if (uid != _playerMan.LocalEntity)
+            return;
+
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnInit(EntityUid uid, SaturationScaleOverlayComponent component, ComponentInit args)
+    {
+        if (uid != _playerMan.LocalEntity)
+            return;
+
+        _overlayMan.AddOverlay(_overlay);
+    }
+}
diff --git a/...ent/DeltaV/Overlays/UltraVisionOverlay.cs → ...ent.Client/Overlays/UltraVisionOverlay.cs b/...ent/DeltaV/Overlays/UltraVisionOverlay.cs → ...ent.Client/Overlays/UltraVisionOverlay.cs
@@ -2,9 +2,9 @@
 using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
-using Content.Shared.Abilities;
+using Content.Shared.Traits.Assorted.Components;
 
-namespace Content.Client.DeltaV.Overlays;
+namespace Content.Client.Overlays;
 
 public sealed partial class UltraVisionOverlay : Overlay
 {
@@ -23,22 +23,27 @@ public UltraVisionOverlay()
         _ultraVisionShader = _prototypeManager.Index<ShaderPrototype>("UltraVision").Instance().Duplicate();
     }
 
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (_playerManager.LocalEntity is not { Valid: true } player
+            || !_entityManager.HasComponent<UltraVisionComponent>(player))
+            return false;
+
+        return base.BeforeDraw(in args);
+    }
+
     protected override void Draw(in OverlayDrawArgs args)
     {
-        if (ScreenTexture == null)
+        if (ScreenTexture is null)
             return;
-        if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
-            return;
-        if (!_entityManager.HasComponent<UltraVisionComponent>(player))
-            return;
-
-        _ultraVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
+        _ultraVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
         var worldHandle = args.WorldHandle;
         var viewport = args.WorldBounds;
         worldHandle.SetTransform(Matrix3.Identity);
         worldHandle.UseShader(_ultraVisionShader);
         worldHandle.DrawRect(viewport, Color.White);
+        worldHandle.UseShader(null);
     }
 }
diff --git a/...ient/DeltaV/Overlays/UltraVisionSystem.cs → Content.Client/Overlays/UltraVisionSystem.cs b/...ient/DeltaV/Overlays/UltraVisionSystem.cs → Content.Client/Overlays/UltraVisionSystem.cs
@@ -1,14 +1,16 @@
-using Content.Shared.Abilities;
+using Content.Shared.Traits.Assorted.Components;
 using Content.Shared.DeltaV.CCVars;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
+using Robust.Shared.Player;
 
-namespace Content.Client.DeltaV.Overlays;
+namespace Content.Client.Overlays;
 
 public sealed partial class UltraVisionSystem : EntitySystem
 {
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
 
     private UltraVisionOverlay _overlay = default!;
 
@@ -18,6 +20,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<UltraVisionComponent, ComponentInit>(OnUltraVisionInit);
         SubscribeLocalEvent<UltraVisionComponent, ComponentShutdown>(OnUltraVisionShutdown);
+        SubscribeLocalEvent<UltraVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<UltraVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
 
         Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
 
@@ -26,11 +30,28 @@ public override void Initialize()
 
     private void OnUltraVisionInit(EntityUid uid, UltraVisionComponent component, ComponentInit args)
     {
+        if (uid != _playerMan.LocalEntity)
+            return;
+
         if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnUltraVisionShutdown(EntityUid uid, UltraVisionComponent component, ComponentShutdown args)
+    {
+        if (uid != _playerMan.LocalEntity)
+            return;
+
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnPlayerAttached(EntityUid uid, UltraVisionComponent component, LocalPlayerAttachedEvent args)
+    {
+        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, UltraVisionComponent component, LocalPlayerDetachedEvent args)
     {
         _overlayMan.RemoveOverlay(_overlay);
     }