From 1bb1a4f2c4265dd770f3ddfb4a30e1e353bb46a9 Mon Sep 17 00:00:00 2001
From: theg33ka <erik6996@gmail.com>
Date: Wed, 8 Jul 2026 01:51:33 +0700
Subject: [PATCH 1/5] added colorable walls

---
 .../Systems/Sandbox/SandboxUIController.cs    |   4 +
 .../Sandbox/Windows/SandboxWindow.xaml        |   1 +
 .../WallPaint/UI/WallPaintUIController.cs     |  60 +++++++
 .../_Mono/WallPaint/UI/WallPaintWindow.xaml   |   9 +
 .../WallPaint/UI/WallPaintWindow.xaml.cs      |  42 +++++
 .../WallPaint/WallPaintPlacementSystem.cs     | 155 ++++++++++++++++++
 .../_Mono/WallPaint/WallPaintVisualsSystem.cs |  83 ++++++++++
 .../_Mono/WallPaint/FillWallPaintCommand.cs   |  75 +++++++++
 .../_Mono/WallPaint/WallPaintSystem.cs        |  89 ++++++++++
 .../_Mono/WallPaint/PaintableWallComponent.cs |  10 ++
 .../_Mono/WallPaint/WallPaintComponent.cs     |  13 ++
 .../_Mono/WallPaint/WallPaintEvents.cs        |  20 +++
 Resources/Locale/en-US/_Mono/wall-paint.ftl   |   2 +
 .../Locale/en-US/sandbox/sandbox-manager.ftl  |   1 +
 Resources/Locale/ru-RU/_Mono/wall-paint.ftl   |   2 +
 .../Locale/ru-RU/sandbox/sandbox-manager.ftl  |   1 +
 .../Entities/Structures/Walls/walls.yml       |   6 +
 .../Structures/Windows/plastitanium.yml       |   2 +
 .../Structures/Windows/reinforced.yml         |   2 +
 .../Entities/Structures/Windows/shuttle.yml   |   2 +
 Resources/Prototypes/Shaders/wall_paint.yml   |   4 +
 .../Textures/Shaders/wall_paint_darken.swsl   |  17 ++
 22 files changed, 600 insertions(+)
 create mode 100644 Content.Client/_Mono/WallPaint/UI/WallPaintUIController.cs
 create mode 100644 Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml
 create mode 100644 Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml.cs
 create mode 100644 Content.Client/_Mono/WallPaint/WallPaintPlacementSystem.cs
 create mode 100644 Content.Client/_Mono/WallPaint/WallPaintVisualsSystem.cs
 create mode 100644 Content.Server/_Mono/WallPaint/FillWallPaintCommand.cs
 create mode 100644 Content.Server/_Mono/WallPaint/WallPaintSystem.cs
 create mode 100644 Content.Shared/_Mono/WallPaint/PaintableWallComponent.cs
 create mode 100644 Content.Shared/_Mono/WallPaint/WallPaintComponent.cs
 create mode 100644 Content.Shared/_Mono/WallPaint/WallPaintEvents.cs
 create mode 100644 Resources/Locale/en-US/_Mono/wall-paint.ftl
 create mode 100644 Resources/Locale/ru-RU/_Mono/wall-paint.ftl
 create mode 100644 Resources/Prototypes/Shaders/wall_paint.yml
 create mode 100644 Resources/Textures/Shaders/wall_paint_darken.swsl

diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index f4e37c5034c..57961a5f1b0 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -4,6 +4,7 @@
 using Content.Client.Markers;
 using Content.Client.Sandbox;
 using Content.Client.SubFloor;
+using Content.Client._Mono.WallPaint.UI;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.DecalPlacer;
 using Content.Client.UserInterface.Systems.Sandbox.Windows;
@@ -46,6 +47,7 @@ public sealed partial class SandboxUIController : UIController, IOnStateChanged<
     private EntitySpawningUIController EntitySpawningController => UIManager.GetUIController<EntitySpawningUIController>();
     private TileSpawningUIController TileSpawningController => UIManager.GetUIController<TileSpawningUIController>();
     private DecalPlacerUIController DecalPlacerController => UIManager.GetUIController<DecalPlacerUIController>();
+    private WallPaintUIController WallPaintController => UIManager.GetUIController<WallPaintUIController>();
 
     private MenuButton? SandboxButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.SandboxButton;
 
@@ -143,6 +145,7 @@ private void EnsureWindow()
         _window.SpawnTilesButton.OnPressed += _ => TileSpawningController.ToggleWindow();
         _window.SpawnEntitiesButton.OnPressed += _ => EntitySpawningController.ToggleWindow();
         _window.SpawnDecalsButton.OnPressed += _ => DecalPlacerController.ToggleWindow();
+        _window.PaintWallsButton.OnPressed += _ => WallPaintController.ToggleWindow();
         _window.GiveFullAccessButton.OnPressed += _ => _sandbox.GiveAdminAccess();
         _window.GiveAghostButton.OnPressed += _ => _sandbox.GiveAGhost();
         _window.ToggleLightButton.OnToggled += _ => _sandbox.ToggleLight();
@@ -197,6 +200,7 @@ private void CloseAll()
         _window?.Close();
         EntitySpawningController.CloseWindow();
         TileSpawningController.CloseWindow();
+        WallPaintController.CloseWindow();
     }
 
     private bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
index bec1d6b4d6f..258d7b3dfe9 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
@@ -8,6 +8,7 @@
         <Button Name="SpawnTilesButton" Access="Public" Text="{Loc sandbox-window-spawn-tiles-button}"/>
         <Button Name="SpawnEntitiesButton" Access="Public" Text="{Loc sandbox-window-spawn-entities-button}"/>
         <Button Name="SpawnDecalsButton" Access="Public" Text="{Loc sandbox-window-spawn-decals-button}"/>
+        <Button Name="PaintWallsButton" Access="Public" Text="{Loc sandbox-window-paint-walls-button}"/>
 
         <Label Text="{Loc sandbox-window-visibility-label}"/>
         <Button Name="ToggleLightButton" Access="Public" Text="{Loc sandbox-window-toggle-lights-button}" ToggleMode="True"/>
diff --git a/Content.Client/_Mono/WallPaint/UI/WallPaintUIController.cs b/Content.Client/_Mono/WallPaint/UI/WallPaintUIController.cs
new file mode 100644
index 00000000000..3c097ff99ef
--- /dev/null
+++ b/Content.Client/_Mono/WallPaint/UI/WallPaintUIController.cs
@@ -0,0 +1,60 @@
+using Content.Client.Gameplay;
+using Content.Client.Sandbox;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.Controllers;
+
+namespace Content.Client._Mono.WallPaint.UI;
+
+public sealed partial class WallPaintUIController : UIController, IOnStateExited<GameplayState>, IOnSystemChanged<SandboxSystem>
+{
+    [UISystemDependency] private readonly SandboxSystem _sandbox = default!;
+
+    private WallPaintWindow? _window;
+
+    public void ToggleWindow()
+    {
+        EnsureWindow();
+
+        if (_window!.IsOpen)
+            _window.Close();
+        else if (_sandbox.SandboxAllowed)
+            _window.Open();
+    }
+
+    public void OnStateExited(GameplayState state)
+    {
+        if (_window == null)
+            return;
+
+        _window.Dispose();
+        _window = null;
+    }
+
+    public void OnSystemLoaded(SandboxSystem system)
+    {
+        _sandbox.SandboxDisabled += CloseWindow;
+    }
+
+    public void OnSystemUnloaded(SandboxSystem system)
+    {
+        _sandbox.SandboxDisabled -= CloseWindow;
+    }
+
+    private void EnsureWindow()
+    {
+        if (_window is { Disposed: false })
+            return;
+
+        _window = UIManager.CreateWindow<WallPaintWindow>();
+        LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterLeft);
+    }
+
+    public void CloseWindow()
+    {
+        if (_window == null || _window.Disposed)
+            return;
+
+        _window.Close();
+    }
+}
diff --git a/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml b/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml
new file mode 100644
index 00000000000..3db23d17423
--- /dev/null
+++ b/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml
@@ -0,0 +1,9 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               Title="{Loc 'wall-paint-window-title'}"
+               MinSize="250 230"
+               SetSize="250 230">
+    <BoxContainer Orientation="Vertical" SeparationOverride="4">
+        <ColorSelectorSliders Name="ColorPicker" IsAlphaVisible="True" />
+        <CheckBox Name="ErasePaint" Text="{Loc 'wall-paint-window-erase'}" />
+    </BoxContainer>
+</DefaultWindow>
diff --git a/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml.cs b/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml.cs
new file mode 100644
index 00000000000..d09c2886ee2
--- /dev/null
+++ b/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml.cs
@@ -0,0 +1,42 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._Mono.WallPaint.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class WallPaintWindow : DefaultWindow
+{
+    [Dependency] private IEntityManager _entity = default!;
+
+    private WallPaintPlacementSystem _wallPaint = default!;
+
+    public WallPaintWindow()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _wallPaint = _entity.System<WallPaintPlacementSystem>();
+        ColorPicker.Color = _wallPaint.Color;
+        ErasePaint.Pressed = _wallPaint.Erase;
+
+        ColorPicker.OnColorChanged += color =>
+        {
+            _wallPaint.SetColor(color);
+        };
+
+        ErasePaint.OnToggled += args => _wallPaint.SetErase(args.Pressed);
+    }
+
+    protected override void Opened()
+    {
+        base.Opened();
+        _wallPaint.SetActive(true);
+    }
+
+    public override void Close()
+    {
+        base.Close();
+        _wallPaint.SetActive(false);
+    }
+}
diff --git a/Content.Client/_Mono/WallPaint/WallPaintPlacementSystem.cs b/Content.Client/_Mono/WallPaint/WallPaintPlacementSystem.cs
new file mode 100644
index 00000000000..28deddb63b8
--- /dev/null
+++ b/Content.Client/_Mono/WallPaint/WallPaintPlacementSystem.cs
@@ -0,0 +1,155 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.Clickable;
+using Content.Client.Decals;
+using Content.Shared._Mono.WallPaint;
+using Robust.Client.ComponentTrees;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Placement;
+using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+
+namespace Content.Client._Mono.WallPaint;
+
+public sealed partial class WallPaintPlacementSystem : EntitySystem
+{
+    [Dependency] private IEyeManager _eye = default!;
+    [Dependency] private IInputManager _input = default!;
+    [Dependency] private IPlacementManager _placement = default!;
+    [Dependency] private InputSystem _inputSystem = default!;
+    [Dependency] private DecalPlacementSystem _decals = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+
+    private readonly ClickableEntityComparer _comparer = new();
+
+    private Color _color = Color.FromHex("#8B0000CC");
+    private bool _active;
+    private bool _erase;
+
+    public Color Color => _color;
+    public bool Erase => _erase;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        CommandBinds.Builder
+            .Bind(EngineKeyFunctions.EditorPlaceObject, new PointerInputCmdHandler(HandlePaint, outsidePrediction: true))
+            .Register<WallPaintPlacementSystem>();
+    }
+
+    public override void Shutdown()
+    {
+        CommandBinds.Unregister<WallPaintPlacementSystem>();
+        base.Shutdown();
+    }
+
+    public void SetActive(bool active)
+    {
+        if (_active == active)
+            return;
+
+        _active = active;
+
+        if (_active)
+        {
+            _placement.Clear();
+            _decals.SetActive(false);
+            _input.Contexts.SetActiveContext("editor");
+        }
+        else
+        {
+            _inputSystem.SetEntityContextActive();
+        }
+    }
+
+    public void SetColor(Color color)
+    {
+        _color = color;
+    }
+
+    public void SetErase(bool erase)
+    {
+        _erase = erase;
+    }
+
+    private bool HandlePaint(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        if (!_active)
+            return false;
+
+        var target = GetPaintTarget(coords, uid);
+        if (target == null)
+            return true;
+
+        RaiseNetworkEvent(new WallPaintRequestEvent(GetNetEntity(target.Value), _color, _erase));
+        return true;
+    }
+
+    private EntityUid? GetPaintTarget(EntityCoordinates coords, EntityUid uid)
+    {
+        if (uid.IsValid() && HasComp<PaintableWallComponent>(uid))
+            return uid;
+
+        foreach (var entity in GetClickableEntities(_transform.ToMapCoordinates(coords)))
+        {
+            if (HasComp<PaintableWallComponent>(entity))
+                return entity;
+        }
+
+        return null;
+    }
+
+    private IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates)
+    {
+        if (_eye.CurrentEye == null)
+            return Array.Empty<EntityUid>();
+
+        var spriteTree = EntityManager.System<SpriteTreeSystem>();
+        var entities = spriteTree.QueryAabb(coordinates.MapId, Box2.CenteredAround(coordinates.Position, new Vector2(1, 1)));
+        var found = new List<(EntityUid Uid, int DrawDepth, uint RenderOrder, float Bottom)>(entities.Count);
+        var clickQuery = GetEntityQuery<ClickableComponent>();
+        var clickables = EntityManager.System<ClickableSystem>();
+
+        foreach (var entity in entities)
+        {
+            if (clickQuery.TryGetComponent(entity.Uid, out var component) &&
+                clickables.CheckClick((entity.Uid, component, entity.Component, entity.Transform), coordinates.Position, _eye.CurrentEye, out var drawDepth, out var renderOrder, out var bottom))
+            {
+                found.Add((entity.Uid, drawDepth, renderOrder, bottom));
+            }
+        }
+
+        if (found.Count == 0)
+            return Array.Empty<EntityUid>();
+
+        found.Sort(_comparer);
+        return found.Select(entity => entity.Uid);
+    }
+
+    private sealed class ClickableEntityComparer : IComparer<(EntityUid Uid, int DrawDepth, uint RenderOrder, float Bottom)>
+    {
+        public int Compare(
+            (EntityUid Uid, int DrawDepth, uint RenderOrder, float Bottom) x,
+            (EntityUid Uid, int DrawDepth, uint RenderOrder, float Bottom) y)
+        {
+            var cmp = y.DrawDepth.CompareTo(x.DrawDepth);
+            if (cmp != 0)
+                return cmp;
+
+            cmp = y.RenderOrder.CompareTo(x.RenderOrder);
+            if (cmp != 0)
+                return cmp;
+
+            cmp = -y.Bottom.CompareTo(x.Bottom);
+            if (cmp != 0)
+                return cmp;
+
+            return y.Uid.CompareTo(x.Uid);
+        }
+    }
+}
diff --git a/Content.Client/_Mono/WallPaint/WallPaintVisualsSystem.cs b/Content.Client/_Mono/WallPaint/WallPaintVisualsSystem.cs
new file mode 100644
index 00000000000..2b4f6fe077b
--- /dev/null
+++ b/Content.Client/_Mono/WallPaint/WallPaintVisualsSystem.cs
@@ -0,0 +1,83 @@
+using Content.Shared._Mono.WallPaint;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._Mono.WallPaint;
+
+public sealed partial class WallPaintVisualsSystem : EntitySystem
+{
+    [Dependency] private IPrototypeManager _prototype = default!;
+
+    private const string ShaderPrototypeId = "WallPaintDarken";
+    private const float OpaqueAlphaThreshold = 0.95f;
+
+    private readonly Dictionary<EntityUid, ShaderInstance> _shaderInstances = new();
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<WallPaintComponent, ComponentStartup>(OnPaintStartup);
+        SubscribeLocalEvent<WallPaintComponent, AfterAutoHandleStateEvent>(OnPaintHandleState);
+        SubscribeLocalEvent<WallPaintComponent, ComponentShutdown>(OnPaintShutdown);
+        SubscribeLocalEvent<PaintableWallComponent, ComponentStartup>(OnPaintableStartup);
+    }
+
+    private void OnPaintStartup(EntityUid uid, WallPaintComponent component, ComponentStartup args)
+    {
+        UpdateShader(uid, component);
+    }
+
+    private void OnPaintHandleState(EntityUid uid, WallPaintComponent component, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateShader(uid, component);
+    }
+
+    private void OnPaintShutdown(EntityUid uid, WallPaintComponent component, ComponentShutdown args)
+    {
+        ClearShader(uid);
+    }
+
+    private void OnPaintableStartup(EntityUid uid, PaintableWallComponent component, ComponentStartup args)
+    {
+        if (TryComp(uid, out WallPaintComponent? paint))
+            UpdateShader(uid, paint);
+    }
+
+    private void UpdateShader(EntityUid uid, WallPaintComponent paint, SpriteComponent? sprite = null)
+    {
+        if (!Resolve(uid, ref sprite, false))
+            return;
+
+        if (!_shaderInstances.TryGetValue(uid, out var shader))
+        {
+            shader = _prototype.Index<ShaderPrototype>(ShaderPrototypeId).InstanceUnique();
+            _shaderInstances[uid] = shader;
+        }
+
+        shader.SetParameter("paintColor", paint.Color);
+        shader.SetParameter("protectTransparency", TryComp(uid, out PaintableWallComponent? paintable) && paintable.ProtectTransparent);
+        shader.SetParameter("opaqueAlphaThreshold", OpaqueAlphaThreshold);
+
+        sprite.PostShader = shader;
+        sprite.GetScreenTexture = false;
+        sprite.RaiseShaderEvent = false;
+    }
+
+    private void ClearShader(EntityUid uid)
+    {
+        if (!_shaderInstances.Remove(uid, out var shader))
+            return;
+
+        if (!TerminatingOrDeleted(uid) &&
+            TryComp(uid, out SpriteComponent? sprite) &&
+            sprite.PostShader == shader)
+        {
+            sprite.PostShader = null;
+            sprite.GetScreenTexture = false;
+            sprite.RaiseShaderEvent = false;
+        }
+
+        shader.Dispose();
+    }
+}
diff --git a/Content.Server/_Mono/WallPaint/FillWallPaintCommand.cs b/Content.Server/_Mono/WallPaint/FillWallPaintCommand.cs
new file mode 100644
index 00000000000..f42e06c2551
--- /dev/null
+++ b/Content.Server/_Mono/WallPaint/FillWallPaintCommand.cs
@@ -0,0 +1,75 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Maths;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server._Mono.WallPaint;
+
+[AdminCommand(AdminFlags.Mapping)]
+public sealed partial class FillWallPaintCommand : IConsoleCommand
+{
+    [Dependency] private IEntityManager _entManager = default!;
+    [Dependency] private IEntitySystemManager _systemManager = default!;
+
+    public string Command => "fpaint";
+    public string Description => "Paints every paintable wall/window on a grid.";
+    public string Help => $"{Command} <grid id> #<color>";
+
+    public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        return args.Length switch
+        {
+            1 => CompletionResult.FromHintOptions(CompletionHelper.Components<MapGridComponent>(args[0], _entManager), "<grid id>"),
+            2 => CompletionResult.FromHint("#RRGGBB or #RRGGBBAA"),
+            _ => CompletionResult.Empty,
+        };
+    }
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Help);
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var gridNetId) ||
+            !_entManager.TryGetEntity(gridNetId, out var gridUid) ||
+            !_entManager.TryGetComponent(gridUid.Value, out TransformComponent? transform) ||
+            !_entManager.HasComponent<MapGridComponent>(gridUid.Value))
+        {
+            shell.WriteError($"Failed to parse grid id '{args[0]}'. Expected an entity id like n123.");
+            return;
+        }
+
+        var mapSystem = _systemManager.GetEntitySystem<SharedMapSystem>();
+        if (!mapSystem.IsPaused(transform.MapID))
+        {
+            shell.WriteError("Wall paint is only available on paused mapping maps.");
+            return;
+        }
+
+        var remove = args[1].Equals("clear", StringComparison.OrdinalIgnoreCase);
+        var color = Color.White;
+
+        if (!remove)
+        {
+            var parsed = Color.TryFromHex(args[1]);
+            if (parsed == null)
+            {
+                shell.WriteError($"Failed to parse color '{args[1]}'. Expected #RRGGBB or #RRGGBBAA.");
+                return;
+            }
+
+            color = parsed.Value;
+        }
+
+        var wallPaint = _systemManager.GetEntitySystem<WallPaintSystem>();
+        var count = wallPaint.PaintGrid(gridUid.Value, color, remove);
+        var action = remove ? "Cleared paint from" : $"Painted with {color.ToHex()}";
+        shell.WriteLine($"{action} {count} walls/windows.");
+    }
+}
diff --git a/Content.Server/_Mono/WallPaint/WallPaintSystem.cs b/Content.Server/_Mono/WallPaint/WallPaintSystem.cs
new file mode 100644
index 00000000000..f466c5bfa07
--- /dev/null
+++ b/Content.Server/_Mono/WallPaint/WallPaintSystem.cs
@@ -0,0 +1,89 @@
+using Content.Server.Administration.Managers;
+using Content.Shared._Mono.WallPaint;
+using Content.Shared.Administration;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Player;
+
+namespace Content.Server._Mono.WallPaint;
+
+public sealed partial class WallPaintSystem : EntitySystem
+{
+    [Dependency] private IAdminManager _admin = default!;
+    [Dependency] private SharedMapSystem _mapSystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeNetworkEvent<WallPaintRequestEvent>(OnPaintRequest);
+    }
+
+    public bool TrySetPaint(EntityUid uid, Color color, bool remove)
+    {
+        if (!HasComp<PaintableWallComponent>(uid))
+            return false;
+
+        if (remove)
+            return RemComp<WallPaintComponent>(uid);
+
+        var paint = EnsureComp<WallPaintComponent>(uid);
+        paint.Color = color;
+        Dirty(uid, paint);
+        return true;
+    }
+
+    public int PaintGrid(EntityUid gridUid, Color color, bool remove)
+    {
+        var count = 0;
+        var query = EntityQueryEnumerator<PaintableWallComponent, TransformComponent>();
+
+        while (query.MoveNext(out var uid, out _, out var transform))
+        {
+            if (transform.GridUid != gridUid)
+                continue;
+
+            if (TrySetPaint(uid, color, remove))
+                count++;
+        }
+
+        return count;
+    }
+
+    public bool CanUseMappingPaint(ICommonSession session, EntityUid target)
+    {
+        if (!_admin.IsAdmin(session, true) ||
+            !_admin.HasAdminFlag(session, AdminFlags.Mapping) ||
+            !HasComp<PaintableWallComponent>(target))
+        {
+            return false;
+        }
+
+        if (session.AttachedEntity is not { } attached ||
+            !TryComp(attached, out TransformComponent? actorTransform) ||
+            !TryComp(target, out TransformComponent? targetTransform))
+        {
+            return false;
+        }
+
+        var targetMap = targetTransform.MapID;
+        if (targetMap == MapId.Nullspace ||
+            actorTransform.MapID != targetMap ||
+            !_mapSystem.IsPaused(targetMap))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private void OnPaintRequest(WallPaintRequestEvent ev, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession is not { } session ||
+            !TryGetEntity(ev.Target, out var target) ||
+            !CanUseMappingPaint(session, target.Value))
+        {
+            return;
+        }
+
+        TrySetPaint(target.Value, ev.Color, ev.Remove);
+    }
+}
diff --git a/Content.Shared/_Mono/WallPaint/PaintableWallComponent.cs b/Content.Shared/_Mono/WallPaint/PaintableWallComponent.cs
new file mode 100644
index 00000000000..ed29287bc2d
--- /dev/null
+++ b/Content.Shared/_Mono/WallPaint/PaintableWallComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared._Mono.WallPaint;
+
+[RegisterComponent]
+public sealed partial class PaintableWallComponent : Component
+{
+    [DataField]
+    public bool ProtectTransparent;
+}
diff --git a/Content.Shared/_Mono/WallPaint/WallPaintComponent.cs b/Content.Shared/_Mono/WallPaint/WallPaintComponent.cs
new file mode 100644
index 00000000000..5d252d71365
--- /dev/null
+++ b/Content.Shared/_Mono/WallPaint/WallPaintComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Maths;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Shared._Mono.WallPaint;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class WallPaintComponent : Component
+{
+    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public Color Color = Color.White;
+}
diff --git a/Content.Shared/_Mono/WallPaint/WallPaintEvents.cs b/Content.Shared/_Mono/WallPaint/WallPaintEvents.cs
new file mode 100644
index 00000000000..1a9a2aacf5e
--- /dev/null
+++ b/Content.Shared/_Mono/WallPaint/WallPaintEvents.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Mono.WallPaint;
+
+[Serializable, NetSerializable]
+public sealed class WallPaintRequestEvent : EntityEventArgs
+{
+    public NetEntity Target;
+    public Color Color;
+    public bool Remove;
+
+    public WallPaintRequestEvent(NetEntity target, Color color, bool remove)
+    {
+        Target = target;
+        Color = color;
+        Remove = remove;
+    }
+}
diff --git a/Resources/Locale/en-US/_Mono/wall-paint.ftl b/Resources/Locale/en-US/_Mono/wall-paint.ftl
new file mode 100644
index 00000000000..d68448dcc2a
--- /dev/null
+++ b/Resources/Locale/en-US/_Mono/wall-paint.ftl
@@ -0,0 +1,2 @@
+wall-paint-window-title = Wall Paint
+wall-paint-window-erase = Erase paint
diff --git a/Resources/Locale/en-US/sandbox/sandbox-manager.ftl b/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
index cc3c46ff590..28a6fa88307 100644
--- a/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
+++ b/Resources/Locale/en-US/sandbox/sandbox-manager.ftl
@@ -9,6 +9,7 @@ sandbox-window-respawn-button = Respawn
 sandbox-window-spawn-entities-button = Spawn Entities
 sandbox-window-spawn-tiles-button = Spawn Tiles
 sandbox-window-spawn-decals-button = Spawn Decals
+sandbox-window-paint-walls-button = Paint Walls
 sandbox-window-grant-full-access-button = Grant Full Access
 sandbox-window-ghost-button = Ghost
 sandbox-window-toggle-lights-button = Toggle Lights
diff --git a/Resources/Locale/ru-RU/_Mono/wall-paint.ftl b/Resources/Locale/ru-RU/_Mono/wall-paint.ftl
new file mode 100644
index 00000000000..938f4e36fc2
--- /dev/null
+++ b/Resources/Locale/ru-RU/_Mono/wall-paint.ftl
@@ -0,0 +1,2 @@
+wall-paint-window-title = Покраска стен
+wall-paint-window-erase = Стереть покраску
diff --git a/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl b/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl
index a42f4c97ef1..d28096b48cf 100644
--- a/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl
+++ b/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl
@@ -7,6 +7,7 @@ sandbox-window-respawn-button = Возрождение
 sandbox-window-spawn-entities-button = Спавн сущностей
 sandbox-window-spawn-tiles-button = Спавн тайлов
 sandbox-window-spawn-decals-button = Спавн декалей
+sandbox-window-paint-walls-button = Покраска стен
 sandbox-window-grant-full-access-button = Дать полный доступ
 sandbox-window-ghost-button = Призрак
 sandbox-window-toggle-lights-button = Переключить освещение
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 60d4cd4f214..fe27537ab0d 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -320,6 +320,7 @@
     - Wall
   - type: Sprite
     sprite: Structures/Walls/plastitanium.rsi
+  - type: PaintableWall
   - type: Icon
     sprite: Structures/Walls/plastitanium.rsi
   - type: IconSmooth
@@ -401,6 +402,7 @@
     drawdepth: Walls
     sprite: Structures/Walls/plastitanium_diagonal.rsi
     state: state0
+  - type: PaintableWall
   - type: IconSmooth
     mode: Diagonal
     key: walls
@@ -440,6 +442,7 @@
   components:
   - type: Sprite
     sprite: Structures/Walls/solid.rsi
+  - type: PaintableWall
   - type: Icon
     sprite: Structures/Walls/solid.rsi
     state: rgeneric
@@ -522,6 +525,7 @@
     drawdepth: Walls
     sprite: Structures/Walls/reinforced_diagonal.rsi
     state: state0
+  - type: PaintableWall
   - type: IconSmooth
     mode: Diagonal
     key: walls
@@ -645,6 +649,7 @@
     drawdepth: Walls
     sprite: Structures/Walls/shuttle_diagonal.rsi
     state: state0
+  - type: PaintableWall
   - type: IconSmooth
     mode: Diagonal
     key: walls
@@ -698,6 +703,7 @@
     resistance: 5
   - type: Sprite
     sprite: Structures/Walls/shuttle.rsi
+  - type: PaintableWall
   - type: Icon
     sprite: Structures/Walls/shuttle.rsi
     state: full
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
index 40db1acfafa..5dc4c69e4e4 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -17,6 +17,8 @@
         collection: GlassSmack
   - type: WallMount
     arc: 360 # interact despite grilles
+  - type: PaintableWall
+    protectTransparent: true
   - type: Tag
     tags:
       - ForceFixRotations
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index a5070ca9723..f020165637a 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -6,6 +6,8 @@
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Windows/reinforced_window.rsi
+  - type: PaintableWall
+    protectTransparent: true
   - type: Icon
     sprite: Structures/Windows/reinforced_window.rsi
   - type: Repairable
diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index f81d94b875e..50be2c2034b 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -6,6 +6,8 @@
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Windows/shuttle_window.rsi
+  - type: PaintableWall
+    protectTransparent: true
   - type: Icon
     sprite: Structures/Windows/shuttle_window.rsi
   - type: Repairable
diff --git a/Resources/Prototypes/Shaders/wall_paint.yml b/Resources/Prototypes/Shaders/wall_paint.yml
new file mode 100644
index 00000000000..bbf9b303457
--- /dev/null
+++ b/Resources/Prototypes/Shaders/wall_paint.yml
@@ -0,0 +1,4 @@
+- type: shader
+  id: WallPaintDarken
+  kind: source
+  path: "/Textures/Shaders/wall_paint_darken.swsl"
diff --git a/Resources/Textures/Shaders/wall_paint_darken.swsl b/Resources/Textures/Shaders/wall_paint_darken.swsl
new file mode 100644
index 00000000000..f690a470e89
--- /dev/null
+++ b/Resources/Textures/Shaders/wall_paint_darken.swsl
@@ -0,0 +1,17 @@
+light_mode unshaded;
+
+uniform highp vec4 paintColor;
+uniform bool protectTransparency;
+uniform highp float opaqueAlphaThreshold;
+
+void fragment() {
+    highp vec4 base = zTexture(UV);
+    highp float paintAmount = paintColor.a;
+
+    if (protectTransparency && base.a < opaqueAlphaThreshold) {
+        paintAmount = 0.0;
+    }
+
+    highp vec3 darkened = min(base.rgb, paintColor.rgb);
+    COLOR = vec4(mix(base.rgb, darkened, paintAmount), base.a);
+}

From 20988feb86ed9bbaaf92ebc56e41842219a2a0bd Mon Sep 17 00:00:00 2001
From: theg33ka <erik6996@gmail.com>
Date: Wed, 8 Jul 2026 17:59:33 +0700
Subject: [PATCH 2/5] fix

---
 .../Systems/Sandbox/SandboxUIController.cs    |   2 +-
 .../WallPaint/UI/WallPaintUIController.cs     |   2 +-
 .../WallPaint/UI/WallPaintWindow.xaml         |   0
 .../WallPaint/UI/WallPaintWindow.xaml.cs      |   2 +-
 .../WallPaint/WallPaintPlacementSystem.cs     |   4 +-
 .../WallPaint/WallPaintVisualsSystem.cs       |   6 +-
 .../WallPaint/FillWallPaintCommand.cs         |  56 ++++--
 .../_Forge/WallPaint/WallPaintSystem.cs       | 159 ++++++++++++++++++
 .../_Mono/WallPaint/WallPaintSystem.cs        |  89 ----------
 .../WallPaint/PaintableWallComponent.cs       |   2 +-
 .../WallPaint/WallPaintComponent.cs           |   5 +-
 .../WallPaint/WallPaintEvents.cs              |   2 +-
 .../en-US/{_Mono => _Forge}/wall-paint.ftl    |   0
 .../ru-RU/{_Mono => _Forge}/wall-paint.ftl    |   0
 .../Entities/Structures/Walls/walls.yml       |   1 +
 .../Structures/Windows/reinforced.yml         |   2 +
 Resources/Prototypes/Shaders/wall_paint.yml   |   4 -
 .../Prototypes/_Forge/Shaders/wall_paint.yml  |   4 +
 .../Shaders/wall_paint_darken.swsl            |   0
 19 files changed, 226 insertions(+), 114 deletions(-)
 rename Content.Client/{_Mono => _Forge}/WallPaint/UI/WallPaintUIController.cs (96%)
 rename Content.Client/{_Mono => _Forge}/WallPaint/UI/WallPaintWindow.xaml (100%)
 rename Content.Client/{_Mono => _Forge}/WallPaint/UI/WallPaintWindow.xaml.cs (95%)
 rename Content.Client/{_Mono => _Forge}/WallPaint/WallPaintPlacementSystem.cs (98%)
 rename Content.Client/{_Mono => _Forge}/WallPaint/WallPaintVisualsSystem.cs (92%)
 rename Content.Server/{_Mono => _Forge}/WallPaint/FillWallPaintCommand.cs (53%)
 create mode 100644 Content.Server/_Forge/WallPaint/WallPaintSystem.cs
 delete mode 100644 Content.Server/_Mono/WallPaint/WallPaintSystem.cs
 rename Content.Shared/{_Mono => _Forge}/WallPaint/PaintableWallComponent.cs (81%)
 rename Content.Shared/{_Mono => _Forge}/WallPaint/WallPaintComponent.cs (72%)
 rename Content.Shared/{_Mono => _Forge}/WallPaint/WallPaintEvents.cs (90%)
 rename Resources/Locale/en-US/{_Mono => _Forge}/wall-paint.ftl (100%)
 rename Resources/Locale/ru-RU/{_Mono => _Forge}/wall-paint.ftl (100%)
 delete mode 100644 Resources/Prototypes/Shaders/wall_paint.yml
 create mode 100644 Resources/Prototypes/_Forge/Shaders/wall_paint.yml
 rename Resources/Textures/{ => _Forge}/Shaders/wall_paint_darken.swsl (100%)

diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index 57961a5f1b0..0626b3c846e 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -4,7 +4,7 @@
 using Content.Client.Markers;
 using Content.Client.Sandbox;
 using Content.Client.SubFloor;
-using Content.Client._Mono.WallPaint.UI;
+using Content.Client._Forge.WallPaint.UI;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.DecalPlacer;
 using Content.Client.UserInterface.Systems.Sandbox.Windows;
diff --git a/Content.Client/_Mono/WallPaint/UI/WallPaintUIController.cs b/Content.Client/_Forge/WallPaint/UI/WallPaintUIController.cs
similarity index 96%
rename from Content.Client/_Mono/WallPaint/UI/WallPaintUIController.cs
rename to Content.Client/_Forge/WallPaint/UI/WallPaintUIController.cs
index 3c097ff99ef..a7eae090195 100644
--- a/Content.Client/_Mono/WallPaint/UI/WallPaintUIController.cs
+++ b/Content.Client/_Forge/WallPaint/UI/WallPaintUIController.cs
@@ -4,7 +4,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.Controllers;
 
-namespace Content.Client._Mono.WallPaint.UI;
+namespace Content.Client._Forge.WallPaint.UI;
 
 public sealed partial class WallPaintUIController : UIController, IOnStateExited<GameplayState>, IOnSystemChanged<SandboxSystem>
 {
diff --git a/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml b/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml
similarity index 100%
rename from Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml
rename to Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml
diff --git a/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml.cs b/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
similarity index 95%
rename from Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml.cs
rename to Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
index d09c2886ee2..bcdcb5c98e9 100644
--- a/Content.Client/_Mono/WallPaint/UI/WallPaintWindow.xaml.cs
+++ b/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
@@ -2,7 +2,7 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client._Mono.WallPaint.UI;
+namespace Content.Client._Forge.WallPaint.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class WallPaintWindow : DefaultWindow
diff --git a/Content.Client/_Mono/WallPaint/WallPaintPlacementSystem.cs b/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
similarity index 98%
rename from Content.Client/_Mono/WallPaint/WallPaintPlacementSystem.cs
rename to Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
index 28deddb63b8..49793643861 100644
--- a/Content.Client/_Mono/WallPaint/WallPaintPlacementSystem.cs
+++ b/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
@@ -2,7 +2,7 @@
 using System.Numerics;
 using Content.Client.Clickable;
 using Content.Client.Decals;
-using Content.Shared._Mono.WallPaint;
+using Content.Shared._Forge.WallPaint;
 using Robust.Client.ComponentTrees;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -13,7 +13,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 
-namespace Content.Client._Mono.WallPaint;
+namespace Content.Client._Forge.WallPaint;
 
 public sealed partial class WallPaintPlacementSystem : EntitySystem
 {
diff --git a/Content.Client/_Mono/WallPaint/WallPaintVisualsSystem.cs b/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
similarity index 92%
rename from Content.Client/_Mono/WallPaint/WallPaintVisualsSystem.cs
rename to Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
index 2b4f6fe077b..4f271408a22 100644
--- a/Content.Client/_Mono/WallPaint/WallPaintVisualsSystem.cs
+++ b/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
@@ -1,10 +1,10 @@
-using Content.Shared._Mono.WallPaint;
+using Content.Shared._Forge.WallPaint;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client._Mono.WallPaint;
+namespace Content.Client._Forge.WallPaint;
 
 public sealed partial class WallPaintVisualsSystem : EntitySystem
 {
@@ -56,7 +56,7 @@ private void UpdateShader(EntityUid uid, WallPaintComponent paint, SpriteCompone
         }
 
         shader.SetParameter("paintColor", paint.Color);
-        shader.SetParameter("protectTransparency", TryComp(uid, out PaintableWallComponent? paintable) && paintable.ProtectTransparent);
+        shader.SetParameter("protectTransparency", paint.ProtectTransparent);
         shader.SetParameter("opaqueAlphaThreshold", OpaqueAlphaThreshold);
 
         sprite.PostShader = shader;
diff --git a/Content.Server/_Mono/WallPaint/FillWallPaintCommand.cs b/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
similarity index 53%
rename from Content.Server/_Mono/WallPaint/FillWallPaintCommand.cs
rename to Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
index f42e06c2551..7b75070dc01 100644
--- a/Content.Server/_Mono/WallPaint/FillWallPaintCommand.cs
+++ b/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
@@ -6,7 +6,7 @@
 using Robust.Shared.Maths;
 using Robust.Shared.Toolshed;
 
-namespace Content.Server._Mono.WallPaint;
+namespace Content.Server._Forge.WallPaint;
 
 [AdminCommand(AdminFlags.Mapping)]
 public sealed partial class FillWallPaintCommand : IConsoleCommand
@@ -16,13 +16,13 @@ public sealed partial class FillWallPaintCommand : IConsoleCommand
 
     public string Command => "fpaint";
     public string Description => "Paints every paintable wall/window on a grid.";
-    public string Help => $"{Command} <grid id> #<color>";
+    public string Help => $"{Command} <grid/entity id> #<color>";
 
     public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         return args.Length switch
         {
-            1 => CompletionResult.FromHintOptions(CompletionHelper.Components<MapGridComponent>(args[0], _entManager), "<grid id>"),
+            1 => CompletionResult.FromHintOptions(CompletionHelper.Components<MapGridComponent>(args[0], _entManager), "<grid/entity id>"),
             2 => CompletionResult.FromHint("#RRGGBB or #RRGGBBAA"),
             _ => CompletionResult.Empty,
         };
@@ -36,17 +36,14 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!NetEntity.TryParse(args[0], out var gridNetId) ||
-            !_entManager.TryGetEntity(gridNetId, out var gridUid) ||
-            !_entManager.TryGetComponent(gridUid.Value, out TransformComponent? transform) ||
-            !_entManager.HasComponent<MapGridComponent>(gridUid.Value))
+        if (!TryGetGrid(args[0], out var gridUid, out var gridTransform, out var error))
         {
-            shell.WriteError($"Failed to parse grid id '{args[0]}'. Expected an entity id like n123.");
+            shell.WriteError(error);
             return;
         }
 
         var mapSystem = _systemManager.GetEntitySystem<SharedMapSystem>();
-        if (!mapSystem.IsPaused(transform.MapID))
+        if (!mapSystem.IsPaused(gridTransform.MapID))
         {
             shell.WriteError("Wall paint is only available on paused mapping maps.");
             return;
@@ -68,8 +65,47 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         var wallPaint = _systemManager.GetEntitySystem<WallPaintSystem>();
-        var count = wallPaint.PaintGrid(gridUid.Value, color, remove);
+        var count = wallPaint.PaintGrid(gridUid, color, remove);
         var action = remove ? "Cleared paint from" : $"Painted with {color.ToHex()}";
         shell.WriteLine($"{action} {count} walls/windows.");
     }
+
+    private bool TryGetGrid(
+        string rawId,
+        out EntityUid gridUid,
+        out TransformComponent gridTransform,
+        out string error)
+    {
+        gridUid = default;
+        gridTransform = default!;
+
+        if (!NetEntity.TryParse(rawId, out var netId) ||
+            !_entManager.TryGetEntity(netId, out var uid) ||
+            !_entManager.TryGetComponent(uid.Value, out TransformComponent? transform))
+        {
+            error = $"Failed to parse entity id '{rawId}'. Expected an entity id like n123 or 123.";
+            return false;
+        }
+
+        if (_entManager.HasComponent<MapGridComponent>(uid.Value))
+        {
+            gridUid = uid.Value;
+            gridTransform = transform;
+            error = string.Empty;
+            return true;
+        }
+
+        if (transform.GridUid is { } parentGrid &&
+            _entManager.HasComponent<MapGridComponent>(parentGrid) &&
+            _entManager.TryGetComponent(parentGrid, out TransformComponent? parentGridTransform))
+        {
+            gridUid = parentGrid;
+            gridTransform = parentGridTransform;
+            error = string.Empty;
+            return true;
+        }
+
+        error = $"Entity '{rawId}' is not a grid and is not located on a grid.";
+        return false;
+    }
 }
diff --git a/Content.Server/_Forge/WallPaint/WallPaintSystem.cs b/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
new file mode 100644
index 00000000000..79354fde315
--- /dev/null
+++ b/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
@@ -0,0 +1,159 @@
+using Content.Server.Administration.Managers;
+using Content.Shared._Forge.WallPaint;
+using Content.Shared.Administration;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._Forge.WallPaint;
+
+public sealed partial class WallPaintSystem : EntitySystem
+{
+    [Dependency] private IAdminManager _admin = default!;
+    [Dependency] private SharedMapSystem _mapSystem = default!;
+    [Dependency] private IPrototypeManager _prototype = default!;
+
+    private static readonly HashSet<string> PaintablePrototypeIds = new()
+    {
+        "WallShuttle",
+        "WallShuttleInterior",
+        "WallShuttleDiagonal",
+        "ShuttleWindow",
+        "ShuttleWindowDiagonal",
+        "WallReinforced",
+        "WallReinforcedDiagonal",
+        "ReinforcedWindow",
+        "ReinforcedWindowDiagonal",
+        "WindowReinforcedDirectional",
+        "WallPlastitanium",
+        "WallPlastitaniumIndestructible",
+        "WallPlastitaniumDiagonal",
+        "WallPlastitaniumDiagonalIndestructible",
+        "PlastitaniumWindowBase",
+        "PlastitaniumWindowSquareBase",
+        "PlastitaniumWindow",
+        "PlastitaniumWindowIndestructible",
+        "PlastitaniumWindowDiagonalBase",
+        "PlastitaniumWindowDiagonal",
+        "PlastitaniumWindowDiagonalIndestructible",
+    };
+
+    private static readonly HashSet<string> ProtectTransparentPrototypeIds = new()
+    {
+        "ShuttleWindow",
+        "ShuttleWindowDiagonal",
+        "ReinforcedWindow",
+        "ReinforcedWindowDiagonal",
+        "WindowReinforcedDirectional",
+        "PlastitaniumWindowBase",
+        "PlastitaniumWindowSquareBase",
+        "PlastitaniumWindow",
+        "PlastitaniumWindowIndestructible",
+        "PlastitaniumWindowDiagonalBase",
+        "PlastitaniumWindowDiagonal",
+        "PlastitaniumWindowDiagonalIndestructible",
+    };
+
+    public override void Initialize()
+    {
+        SubscribeNetworkEvent<WallPaintRequestEvent>(OnPaintRequest);
+    }
+
+    public bool TrySetPaint(EntityUid uid, Color color, bool remove)
+    {
+        if (!TryGetPaintSettings(uid, out var protectTransparent))
+            return false;
+
+        if (remove)
+            return RemComp<WallPaintComponent>(uid);
+
+        var paint = EnsureComp<WallPaintComponent>(uid);
+        paint.Color = color;
+        paint.ProtectTransparent = protectTransparent;
+        Dirty(uid, paint);
+        return true;
+    }
+
+    public int PaintGrid(EntityUid gridUid, Color color, bool remove)
+    {
+        var count = 0;
+        var query = EntityQueryEnumerator<TransformComponent>();
+
+        while (query.MoveNext(out var uid, out var transform))
+        {
+            if (transform.GridUid != gridUid)
+                continue;
+
+            if (TrySetPaint(uid, color, remove))
+                count++;
+        }
+
+        return count;
+    }
+
+    public bool CanUseMappingPaint(ICommonSession session, EntityUid target)
+    {
+        if (!_admin.IsAdmin(session, true) ||
+            !_admin.HasAdminFlag(session, AdminFlags.Mapping) ||
+            !TryGetPaintSettings(target, out _))
+        {
+            return false;
+        }
+
+        if (session.AttachedEntity is not { } attached ||
+            !TryComp(attached, out TransformComponent? actorTransform) ||
+            !TryComp(target, out TransformComponent? targetTransform))
+        {
+            return false;
+        }
+
+        var targetMap = targetTransform.MapID;
+        if (targetMap == MapId.Nullspace ||
+            actorTransform.MapID != targetMap ||
+            !_mapSystem.IsPaused(targetMap))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private bool TryGetPaintSettings(EntityUid uid, out bool protectTransparent)
+    {
+        if (TryComp(uid, out PaintableWallComponent? paintable))
+        {
+            protectTransparent = paintable.ProtectTransparent;
+            return true;
+        }
+
+        protectTransparent = false;
+
+        if (!TryPrototype(uid, out var prototype) || prototype == null)
+            return false;
+
+        var isPaintable = false;
+        foreach (var (id, _) in _prototype.EnumerateAllParents<EntityPrototype>(prototype.ID, includeSelf: true))
+        {
+            isPaintable |= PaintablePrototypeIds.Contains(id);
+            protectTransparent |= ProtectTransparentPrototypeIds.Contains(id);
+
+            if (isPaintable && protectTransparent)
+                return true;
+        }
+
+        return isPaintable;
+    }
+
+    private void OnPaintRequest(WallPaintRequestEvent ev, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession is not { } session ||
+            !TryGetEntity(ev.Target, out var target) ||
+            !CanUseMappingPaint(session, target.Value))
+        {
+            return;
+        }
+
+        TrySetPaint(target.Value, ev.Color, ev.Remove);
+    }
+}
diff --git a/Content.Server/_Mono/WallPaint/WallPaintSystem.cs b/Content.Server/_Mono/WallPaint/WallPaintSystem.cs
deleted file mode 100644
index f466c5bfa07..00000000000
--- a/Content.Server/_Mono/WallPaint/WallPaintSystem.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using Content.Server.Administration.Managers;
-using Content.Shared._Mono.WallPaint;
-using Content.Shared.Administration;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Player;
-
-namespace Content.Server._Mono.WallPaint;
-
-public sealed partial class WallPaintSystem : EntitySystem
-{
-    [Dependency] private IAdminManager _admin = default!;
-    [Dependency] private SharedMapSystem _mapSystem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeNetworkEvent<WallPaintRequestEvent>(OnPaintRequest);
-    }
-
-    public bool TrySetPaint(EntityUid uid, Color color, bool remove)
-    {
-        if (!HasComp<PaintableWallComponent>(uid))
-            return false;
-
-        if (remove)
-            return RemComp<WallPaintComponent>(uid);
-
-        var paint = EnsureComp<WallPaintComponent>(uid);
-        paint.Color = color;
-        Dirty(uid, paint);
-        return true;
-    }
-
-    public int PaintGrid(EntityUid gridUid, Color color, bool remove)
-    {
-        var count = 0;
-        var query = EntityQueryEnumerator<PaintableWallComponent, TransformComponent>();
-
-        while (query.MoveNext(out var uid, out _, out var transform))
-        {
-            if (transform.GridUid != gridUid)
-                continue;
-
-            if (TrySetPaint(uid, color, remove))
-                count++;
-        }
-
-        return count;
-    }
-
-    public bool CanUseMappingPaint(ICommonSession session, EntityUid target)
-    {
-        if (!_admin.IsAdmin(session, true) ||
-            !_admin.HasAdminFlag(session, AdminFlags.Mapping) ||
-            !HasComp<PaintableWallComponent>(target))
-        {
-            return false;
-        }
-
-        if (session.AttachedEntity is not { } attached ||
-            !TryComp(attached, out TransformComponent? actorTransform) ||
-            !TryComp(target, out TransformComponent? targetTransform))
-        {
-            return false;
-        }
-
-        var targetMap = targetTransform.MapID;
-        if (targetMap == MapId.Nullspace ||
-            actorTransform.MapID != targetMap ||
-            !_mapSystem.IsPaused(targetMap))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    private void OnPaintRequest(WallPaintRequestEvent ev, EntitySessionEventArgs args)
-    {
-        if (args.SenderSession is not { } session ||
-            !TryGetEntity(ev.Target, out var target) ||
-            !CanUseMappingPaint(session, target.Value))
-        {
-            return;
-        }
-
-        TrySetPaint(target.Value, ev.Color, ev.Remove);
-    }
-}
diff --git a/Content.Shared/_Mono/WallPaint/PaintableWallComponent.cs b/Content.Shared/_Forge/WallPaint/PaintableWallComponent.cs
similarity index 81%
rename from Content.Shared/_Mono/WallPaint/PaintableWallComponent.cs
rename to Content.Shared/_Forge/WallPaint/PaintableWallComponent.cs
index ed29287bc2d..66b70164a1c 100644
--- a/Content.Shared/_Mono/WallPaint/PaintableWallComponent.cs
+++ b/Content.Shared/_Forge/WallPaint/PaintableWallComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared._Mono.WallPaint;
+namespace Content.Shared._Forge.WallPaint;
 
 [RegisterComponent]
 public sealed partial class PaintableWallComponent : Component
diff --git a/Content.Shared/_Mono/WallPaint/WallPaintComponent.cs b/Content.Shared/_Forge/WallPaint/WallPaintComponent.cs
similarity index 72%
rename from Content.Shared/_Mono/WallPaint/WallPaintComponent.cs
rename to Content.Shared/_Forge/WallPaint/WallPaintComponent.cs
index 5d252d71365..4a8e7984803 100644
--- a/Content.Shared/_Mono/WallPaint/WallPaintComponent.cs
+++ b/Content.Shared/_Forge/WallPaint/WallPaintComponent.cs
@@ -3,11 +3,14 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared._Mono.WallPaint;
+namespace Content.Shared._Forge.WallPaint;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class WallPaintComponent : Component
 {
     [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
     public Color Color = Color.White;
+
+    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public bool ProtectTransparent;
 }
diff --git a/Content.Shared/_Mono/WallPaint/WallPaintEvents.cs b/Content.Shared/_Forge/WallPaint/WallPaintEvents.cs
similarity index 90%
rename from Content.Shared/_Mono/WallPaint/WallPaintEvents.cs
rename to Content.Shared/_Forge/WallPaint/WallPaintEvents.cs
index 1a9a2aacf5e..1c9b61125de 100644
--- a/Content.Shared/_Mono/WallPaint/WallPaintEvents.cs
+++ b/Content.Shared/_Forge/WallPaint/WallPaintEvents.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared._Mono.WallPaint;
+namespace Content.Shared._Forge.WallPaint;
 
 [Serializable, NetSerializable]
 public sealed class WallPaintRequestEvent : EntityEventArgs
diff --git a/Resources/Locale/en-US/_Mono/wall-paint.ftl b/Resources/Locale/en-US/_Forge/wall-paint.ftl
similarity index 100%
rename from Resources/Locale/en-US/_Mono/wall-paint.ftl
rename to Resources/Locale/en-US/_Forge/wall-paint.ftl
diff --git a/Resources/Locale/ru-RU/_Mono/wall-paint.ftl b/Resources/Locale/ru-RU/_Forge/wall-paint.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/_Mono/wall-paint.ftl
rename to Resources/Locale/ru-RU/_Forge/wall-paint.ftl
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index fe27537ab0d..b248bd4bac5 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -757,6 +757,7 @@
     fx: EffectRCDDeconstruct8
   - type: Sprite
     sprite: Structures/Walls/shuttleinterior.rsi
+  - type: PaintableWall
   - type: Icon
     sprite: Structures/Walls/shuttleinterior.rsi
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index f020165637a..c55339f830a 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -78,6 +78,8 @@
   - type: Sprite
     sprite: Structures/Windows/directional.rsi
     state: reinforced_window
+  - type: PaintableWall
+    protectTransparent: true
   - type: Icon
     sprite: Structures/Windows/directional.rsi
     state: reinforced_window
diff --git a/Resources/Prototypes/Shaders/wall_paint.yml b/Resources/Prototypes/Shaders/wall_paint.yml
deleted file mode 100644
index bbf9b303457..00000000000
--- a/Resources/Prototypes/Shaders/wall_paint.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: shader
-  id: WallPaintDarken
-  kind: source
-  path: "/Textures/Shaders/wall_paint_darken.swsl"
diff --git a/Resources/Prototypes/_Forge/Shaders/wall_paint.yml b/Resources/Prototypes/_Forge/Shaders/wall_paint.yml
new file mode 100644
index 00000000000..fa2e4c18df8
--- /dev/null
+++ b/Resources/Prototypes/_Forge/Shaders/wall_paint.yml
@@ -0,0 +1,4 @@
+- type: shader
+  id: WallPaintDarken
+  kind: source
+  path: "/Textures/_Forge/Shaders/wall_paint_darken.swsl"
diff --git a/Resources/Textures/Shaders/wall_paint_darken.swsl b/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl
similarity index 100%
rename from Resources/Textures/Shaders/wall_paint_darken.swsl
rename to Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl

From 4d3c0bee8920293bea2eed36575a79f3dbe213b4 Mon Sep 17 00:00:00 2001
From: theg33ka <erik6996@gmail.com>
Date: Sat, 11 Jul 2026 04:05:30 +0700
Subject: [PATCH 3/5] Fix wall paint lifecycle and targeting

---
 Content.Client/Decals/DecalPlacementSystem.cs |   2 +
 .../DecalPlacer/DecalPlacerUIController.cs    |   2 +-
 .../Systems/Sandbox/SandboxUIController.cs    |  29 +++-
 .../Sandbox/Windows/SandboxWindow.xaml        |   1 +
 .../WallPaint/UI/WallPaintUIController.cs     |  11 ++
 .../WallPaint/UI/WallPaintWindow.xaml.cs      |   8 +-
 .../WallPaint/WallPaintPlacementSystem.cs     | 147 +++++++++++++++---
 .../WallPaint/WallPaintVisualsSystem.cs       |  63 ++++++--
 .../_Forge/WallPaint/FillWallPaintCommand.cs  |   6 +-
 .../_Forge/WallPaint/WallPaintSystem.cs       |  66 +-------
 .../Entities/Structures/Walls/walls.yml       |  14 +-
 .../Structures/Windows/plastitanium.yml       |   2 +-
 .../Structures/Windows/reinforced.yml         |   4 +-
 .../Entities/Structures/Windows/shuttle.yml   |   2 +-
 .../_Forge/Shaders/wall_paint_darken.swsl     |   9 +-
 15 files changed, 242 insertions(+), 124 deletions(-)

diff --git a/Content.Client/Decals/DecalPlacementSystem.cs b/Content.Client/Decals/DecalPlacementSystem.cs
index ac39182ac68..70c1b10047c 100644
--- a/Content.Client/Decals/DecalPlacementSystem.cs
+++ b/Content.Client/Decals/DecalPlacementSystem.cs
@@ -35,6 +35,8 @@ public sealed partial class DecalPlacementSystem : EntitySystem
     private bool _placing;
     private bool _erasing;
 
+    public bool IsActive => _active; // Forge-Change
+
     public (DecalPrototype? Decal, bool Snap, Angle Angle, Color Color) GetActiveDecal()
     {
         return _active && _decalId != null ?
diff --git a/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs b/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs
index 7bfd99ed2f9..f9abe3413c4 100644
--- a/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs
+++ b/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs
@@ -75,7 +75,7 @@ private void EnsureWindow()
         ReloadPrototypes();
     }
 
-    private void CloseWindow()
+    public void CloseWindow() // Forge-Change
     {
         if (_window == null || _window.Disposed)
             return;
diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index 0626b3c846e..49d90a5f34a 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -63,6 +63,7 @@ public void OnStateEntered(GameplayState state)
             {
                 if (!_admin.CanAdminPlace())
                     return;
+                WallPaintController.CloseWindow(); // Forge-Change
                 EntitySpawningController.ToggleWindow();
             }));
         _input.SetInputCommand(ContentKeyFunctions.OpenSandboxWindow,
@@ -72,6 +73,7 @@ public void OnStateEntered(GameplayState state)
             {
                 if (!_admin.CanAdminPlace())
                     return;
+                WallPaintController.CloseWindow(); // Forge-Change
                 TileSpawningController.ToggleWindow();
             }));
         _input.SetInputCommand(ContentKeyFunctions.OpenDecalSpawnWindow,
@@ -79,6 +81,7 @@ public void OnStateEntered(GameplayState state)
             {
                 if (!_admin.CanAdminPlace())
                     return;
+                WallPaintController.CloseWindow(); // Forge-Change
                 DecalPlacerController.ToggleWindow();
             }));
 
@@ -142,10 +145,28 @@ private void EnsureWindow()
                 _console.ExecuteCommand($"rmcomp {pnent.Id} StationAiOverlay");
         };
         _window.RespawnButton.OnPressed += _ => _sandbox.Respawn();
-        _window.SpawnTilesButton.OnPressed += _ => TileSpawningController.ToggleWindow();
-        _window.SpawnEntitiesButton.OnPressed += _ => EntitySpawningController.ToggleWindow();
-        _window.SpawnDecalsButton.OnPressed += _ => DecalPlacerController.ToggleWindow();
-        _window.PaintWallsButton.OnPressed += _ => WallPaintController.ToggleWindow();
+        _window.SpawnTilesButton.OnPressed += _ => // Forge-Change
+        {
+            WallPaintController.CloseWindow();
+            TileSpawningController.ToggleWindow();
+        };
+        _window.SpawnEntitiesButton.OnPressed += _ => // Forge-Change
+        {
+            WallPaintController.CloseWindow();
+            EntitySpawningController.ToggleWindow();
+        };
+        _window.SpawnDecalsButton.OnPressed += _ => // Forge-Change
+        {
+            WallPaintController.CloseWindow();
+            DecalPlacerController.ToggleWindow();
+        };
+        _window.PaintWallsButton.OnPressed += _ => // Forge-Change
+        {
+            EntitySpawningController.CloseWindow();
+            TileSpawningController.CloseWindow();
+            DecalPlacerController.CloseWindow();
+            WallPaintController.ToggleWindow();
+        };
         _window.GiveFullAccessButton.OnPressed += _ => _sandbox.GiveAdminAccess();
         _window.GiveAghostButton.OnPressed += _ => _sandbox.GiveAGhost();
         _window.ToggleLightButton.OnToggled += _ => _sandbox.ToggleLight();
diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
index 258d7b3dfe9..e105349c9c0 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
@@ -8,6 +8,7 @@
         <Button Name="SpawnTilesButton" Access="Public" Text="{Loc sandbox-window-spawn-tiles-button}"/>
         <Button Name="SpawnEntitiesButton" Access="Public" Text="{Loc sandbox-window-spawn-entities-button}"/>
         <Button Name="SpawnDecalsButton" Access="Public" Text="{Loc sandbox-window-spawn-decals-button}"/>
+        <!-- Forge-Change -->
         <Button Name="PaintWallsButton" Access="Public" Text="{Loc sandbox-window-paint-walls-button}"/>
 
         <Label Text="{Loc sandbox-window-visibility-label}"/>
diff --git a/Content.Client/_Forge/WallPaint/UI/WallPaintUIController.cs b/Content.Client/_Forge/WallPaint/UI/WallPaintUIController.cs
index a7eae090195..41128eed630 100644
--- a/Content.Client/_Forge/WallPaint/UI/WallPaintUIController.cs
+++ b/Content.Client/_Forge/WallPaint/UI/WallPaintUIController.cs
@@ -8,6 +8,7 @@ namespace Content.Client._Forge.WallPaint.UI;
 
 public sealed partial class WallPaintUIController : UIController, IOnStateExited<GameplayState>, IOnSystemChanged<SandboxSystem>
 {
+    [Dependency] private readonly IEntitySystemManager _systems = default!;
     [UISystemDependency] private readonly SandboxSystem _sandbox = default!;
 
     private WallPaintWindow? _window;
@@ -24,6 +25,8 @@ public void ToggleWindow()
 
     public void OnStateExited(GameplayState state)
     {
+        DeactivatePaint();
+
         if (_window == null)
             return;
 
@@ -39,6 +42,7 @@ public void OnSystemLoaded(SandboxSystem system)
     public void OnSystemUnloaded(SandboxSystem system)
     {
         _sandbox.SandboxDisabled -= CloseWindow;
+        DeactivatePaint();
     }
 
     private void EnsureWindow()
@@ -46,6 +50,7 @@ private void EnsureWindow()
         if (_window is { Disposed: false })
             return;
 
+        DeactivatePaint();
         _window = UIManager.CreateWindow<WallPaintWindow>();
         LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterLeft);
     }
@@ -57,4 +62,10 @@ public void CloseWindow()
 
         _window.Close();
     }
+
+    private void DeactivatePaint()
+    {
+        if (_systems.TryGetEntitySystem<WallPaintPlacementSystem>(out var wallPaint))
+            wallPaint.Deactivate();
+    }
 }
diff --git a/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs b/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
index bcdcb5c98e9..7d4c4a2fa09 100644
--- a/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
+++ b/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
@@ -37,6 +37,12 @@ protected override void Opened()
     public override void Close()
     {
         base.Close();
-        _wallPaint.SetActive(false);
+        _wallPaint.Deactivate();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        _wallPaint.Deactivate();
+        base.Dispose(disposing);
     }
 }
diff --git a/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs b/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
index 49793643861..2896425b4b9 100644
--- a/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
+++ b/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Numerics;
 using Content.Client.Clickable;
 using Content.Client.Decals;
@@ -8,9 +7,11 @@
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Placement;
+using Robust.Shared.Enums;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
 using Robust.Shared.Player;
 
 namespace Content.Client._Forge.WallPaint;
@@ -26,6 +27,11 @@ public sealed partial class WallPaintPlacementSystem : EntitySystem
 
     private readonly ClickableEntityComparer _comparer = new();
 
+    private SpriteTreeSystem _spriteTree = default!;
+    private ClickableSystem _clickables = default!;
+    private EntityQuery<ClickableComponent> _clickQuery;
+    private PlacementSnapshot? _previousPlacement;
+    private bool _previousDecalsActive;
     private Color _color = Color.FromHex("#8B0000CC");
     private bool _active;
     private bool _erase;
@@ -40,10 +46,15 @@ public override void Initialize()
         CommandBinds.Builder
             .Bind(EngineKeyFunctions.EditorPlaceObject, new PointerInputCmdHandler(HandlePaint, outsidePrediction: true))
             .Register<WallPaintPlacementSystem>();
+
+        _spriteTree = EntityManager.System<SpriteTreeSystem>();
+        _clickables = EntityManager.System<ClickableSystem>();
+        _clickQuery = GetEntityQuery<ClickableComponent>();
     }
 
     public override void Shutdown()
     {
+        Deactivate();
         CommandBinds.Unregister<WallPaintPlacementSystem>();
         base.Shutdown();
     }
@@ -57,16 +68,22 @@ public void SetActive(bool active)
 
         if (_active)
         {
+            CaptureSandboxState();
             _placement.Clear();
             _decals.SetActive(false);
             _input.Contexts.SetActiveContext("editor");
         }
         else
         {
-            _inputSystem.SetEntityContextActive();
+            RestoreSandboxState();
         }
     }
 
+    public void Deactivate()
+    {
+        SetActive(false);
+    }
+
     public void SetColor(Color color)
     {
         _color = color;
@@ -95,40 +112,52 @@ private bool HandlePaint(ICommonSession? session, EntityCoordinates coords, Enti
         if (uid.IsValid() && HasComp<PaintableWallComponent>(uid))
             return uid;
 
-        foreach (var entity in GetClickableEntities(_transform.ToMapCoordinates(coords)))
-        {
-            if (HasComp<PaintableWallComponent>(entity))
-                return entity;
-        }
-
-        return null;
+        return GetClickablePaintTarget(_transform.ToMapCoordinates(coords));
     }
 
-    private IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates)
+    private EntityUid? GetClickablePaintTarget(MapCoordinates coordinates)
     {
         if (_eye.CurrentEye == null)
-            return Array.Empty<EntityUid>();
+            return null;
 
-        var spriteTree = EntityManager.System<SpriteTreeSystem>();
-        var entities = spriteTree.QueryAabb(coordinates.MapId, Box2.CenteredAround(coordinates.Position, new Vector2(1, 1)));
-        var found = new List<(EntityUid Uid, int DrawDepth, uint RenderOrder, float Bottom)>(entities.Count);
-        var clickQuery = GetEntityQuery<ClickableComponent>();
-        var clickables = EntityManager.System<ClickableSystem>();
+        var entities = _spriteTree.QueryAabb(coordinates.MapId, Box2.CenteredAround(coordinates.Position, new Vector2(1, 1)));
+        (EntityUid Uid, int DrawDepth, uint RenderOrder, float Bottom)? best = null;
 
         foreach (var entity in entities)
         {
-            if (clickQuery.TryGetComponent(entity.Uid, out var component) &&
-                clickables.CheckClick((entity.Uid, component, entity.Component, entity.Transform), coordinates.Position, _eye.CurrentEye, out var drawDepth, out var renderOrder, out var bottom))
+            if (!_clickQuery.TryGetComponent(entity.Uid, out var component) ||
+                !HasComp<PaintableWallComponent>(entity.Uid) ||
+                !_clickables.CheckClick((entity.Uid, component, entity.Component, entity.Transform), coordinates.Position, _eye.CurrentEye, out var drawDepth, out var renderOrder, out var bottom))
             {
-                found.Add((entity.Uid, drawDepth, renderOrder, bottom));
+                continue;
             }
+
+            var candidate = (entity.Uid, drawDepth, renderOrder, bottom);
+            if (best == null || _comparer.Compare(candidate, best.Value) < 0)
+                best = candidate;
         }
 
-        if (found.Count == 0)
-            return Array.Empty<EntityUid>();
+        return best?.Uid;
+    }
 
-        found.Sort(_comparer);
-        return found.Select(entity => entity.Uid);
+    private void CaptureSandboxState()
+    {
+        _previousPlacement = PlacementSnapshot.From(_placement);
+        _previousDecalsActive = _decals.IsActive;
+    }
+
+    private void RestoreSandboxState()
+    {
+        var restoredPlacement = _previousPlacement?.Restore(_placement) == true;
+        _previousPlacement = null;
+
+        if (_previousDecalsActive)
+            _decals.SetActive(true);
+
+        if (!restoredPlacement && !_previousDecalsActive)
+            _inputSystem.SetEntityContextActive();
+
+        _previousDecalsActive = false;
     }
 
     private sealed class ClickableEntityComparer : IComparer<(EntityUid Uid, int DrawDepth, uint RenderOrder, float Bottom)>
@@ -152,4 +181,76 @@ public int Compare(
             return y.Uid.CompareTo(x.Uid);
         }
     }
+
+    private sealed class PlacementSnapshot
+    {
+        private readonly PlacementInformation? _permission;
+        private readonly PlacementHijack? _hijack;
+        private readonly bool _eraser;
+        private readonly bool _replacement;
+        private readonly Direction _direction;
+        private readonly bool _mirrored;
+
+        private PlacementSnapshot(
+            PlacementInformation? permission,
+            PlacementHijack? hijack,
+            bool eraser,
+            bool replacement,
+            Direction direction,
+            bool mirrored)
+        {
+            _permission = permission;
+            _hijack = hijack;
+            _eraser = eraser;
+            _replacement = replacement;
+            _direction = direction;
+            _mirrored = mirrored;
+        }
+
+        public static PlacementSnapshot? From(IPlacementManager placement)
+        {
+            if (!placement.IsActive && !placement.Eraser)
+                return null;
+
+            return new PlacementSnapshot(
+                Clone(placement.CurrentPermission),
+                placement is PlacementManager manager ? manager.Hijack : null,
+                placement.Eraser,
+                placement.Replacement,
+                placement.Direction,
+                placement.Mirrored);
+        }
+
+        public bool Restore(IPlacementManager placement)
+        {
+            if (_permission != null)
+                placement.BeginPlacing(_permission, _hijack);
+
+            if (placement.Eraser != _eraser)
+                placement.ToggleEraser();
+
+            placement.Replacement = _replacement;
+            placement.Direction = _direction;
+            placement.Mirrored = _mirrored;
+            return _permission != null || _eraser;
+        }
+
+        private static PlacementInformation? Clone(PlacementInformation? source)
+        {
+            if (source == null)
+                return null;
+
+            return new PlacementInformation
+            {
+                MobUid = source.MobUid,
+                EntityType = source.EntityType,
+                TileType = source.TileType,
+                PlacementOption = source.PlacementOption,
+                Range = source.Range,
+                IsTile = source.IsTile,
+                Uses = source.Uses,
+                UseEditorContext = source.UseEditorContext,
+            };
+        }
+    }
 }
diff --git a/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs b/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
index 4f271408a22..337f388b6db 100644
--- a/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
+++ b/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared._Forge.WallPaint;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -13,7 +14,7 @@ public sealed partial class WallPaintVisualsSystem : EntitySystem
     private const string ShaderPrototypeId = "WallPaintDarken";
     private const float OpaqueAlphaThreshold = 0.95f;
 
-    private readonly Dictionary<EntityUid, ShaderInstance> _shaderInstances = new();
+    private readonly Dictionary<EntityUid, PaintShaderState> _shaderStates = new();
 
     public override void Initialize()
     {
@@ -23,6 +24,16 @@ public override void Initialize()
         SubscribeLocalEvent<PaintableWallComponent, ComponentStartup>(OnPaintableStartup);
     }
 
+    public override void Shutdown()
+    {
+        foreach (var uid in _shaderStates.Keys.ToArray())
+        {
+            ClearShader(uid);
+        }
+
+        base.Shutdown();
+    }
+
     private void OnPaintStartup(EntityUid uid, WallPaintComponent component, ComponentStartup args)
     {
         UpdateShader(uid, component);
@@ -49,35 +60,59 @@ private void UpdateShader(EntityUid uid, WallPaintComponent paint, SpriteCompone
         if (!Resolve(uid, ref sprite, false))
             return;
 
-        if (!_shaderInstances.TryGetValue(uid, out var shader))
+        if (!_shaderStates.TryGetValue(uid, out var state))
         {
-            shader = _prototype.Index<ShaderPrototype>(ShaderPrototypeId).InstanceUnique();
-            _shaderInstances[uid] = shader;
+            state = new PaintShaderState(
+                _prototype.Index<ShaderPrototype>(ShaderPrototypeId).InstanceUnique(),
+                sprite.PostShader,
+                sprite.GetScreenTexture,
+                sprite.RaiseShaderEvent);
+            _shaderStates[uid] = state;
         }
 
-        shader.SetParameter("paintColor", paint.Color);
-        shader.SetParameter("protectTransparency", paint.ProtectTransparent);
-        shader.SetParameter("opaqueAlphaThreshold", OpaqueAlphaThreshold);
+        state.Shader.SetParameter("paintColor", paint.Color);
+        state.Shader.SetParameter("protectTransparency", paint.ProtectTransparent);
+        state.Shader.SetParameter("opaqueAlphaThreshold", OpaqueAlphaThreshold);
 
-        sprite.PostShader = shader;
+        sprite.PostShader = state.Shader;
         sprite.GetScreenTexture = false;
         sprite.RaiseShaderEvent = false;
     }
 
     private void ClearShader(EntityUid uid)
     {
-        if (!_shaderInstances.Remove(uid, out var shader))
+        if (!_shaderStates.Remove(uid, out var state))
             return;
 
         if (!TerminatingOrDeleted(uid) &&
             TryComp(uid, out SpriteComponent? sprite) &&
-            sprite.PostShader == shader)
+            sprite.PostShader == state.Shader)
         {
-            sprite.PostShader = null;
-            sprite.GetScreenTexture = false;
-            sprite.RaiseShaderEvent = false;
+            sprite.PostShader = state.PreviousShader;
+            sprite.GetScreenTexture = state.PreviousGetScreenTexture;
+            sprite.RaiseShaderEvent = state.PreviousRaiseShaderEvent;
         }
 
-        shader.Dispose();
+        state.Shader.Dispose();
+    }
+
+    private sealed class PaintShaderState
+    {
+        public readonly ShaderInstance Shader;
+        public readonly ShaderInstance? PreviousShader;
+        public readonly bool PreviousGetScreenTexture;
+        public readonly bool PreviousRaiseShaderEvent;
+
+        public PaintShaderState(
+            ShaderInstance shader,
+            ShaderInstance? previousShader,
+            bool previousGetScreenTexture,
+            bool previousRaiseShaderEvent)
+        {
+            Shader = shader;
+            PreviousShader = previousShader;
+            PreviousGetScreenTexture = previousGetScreenTexture;
+            PreviousRaiseShaderEvent = previousRaiseShaderEvent;
+        }
     }
 }
diff --git a/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs b/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
index 7b75070dc01..c2719bc6bc7 100644
--- a/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
+++ b/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
@@ -16,14 +16,14 @@ public sealed partial class FillWallPaintCommand : IConsoleCommand
 
     public string Command => "fpaint";
     public string Description => "Paints every paintable wall/window on a grid.";
-    public string Help => $"{Command} <grid/entity id> #<color>";
+    public string Help => $"{Command} <grid/entity NetEntity> <#RRGGBB|#RRGGBBAA|clear> - paint all paintable walls/windows on a paused grid, or clear paint.";
 
     public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         return args.Length switch
         {
-            1 => CompletionResult.FromHintOptions(CompletionHelper.Components<MapGridComponent>(args[0], _entManager), "<grid/entity id>"),
-            2 => CompletionResult.FromHint("#RRGGBB or #RRGGBBAA"),
+            1 => CompletionResult.FromHintOptions(CompletionHelper.NetEntities(args[0], _entManager), "<grid/entity NetEntity>"),
+            2 => CompletionResult.FromHint("#RRGGBB, #RRGGBBAA, or clear"),
             _ => CompletionResult.Empty,
         };
     }
diff --git a/Content.Server/_Forge/WallPaint/WallPaintSystem.cs b/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
index 79354fde315..2db3de6be33 100644
--- a/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
+++ b/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
@@ -4,7 +4,6 @@
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server._Forge.WallPaint;
 
@@ -12,48 +11,6 @@ public sealed partial class WallPaintSystem : EntitySystem
 {
     [Dependency] private IAdminManager _admin = default!;
     [Dependency] private SharedMapSystem _mapSystem = default!;
-    [Dependency] private IPrototypeManager _prototype = default!;
-
-    private static readonly HashSet<string> PaintablePrototypeIds = new()
-    {
-        "WallShuttle",
-        "WallShuttleInterior",
-        "WallShuttleDiagonal",
-        "ShuttleWindow",
-        "ShuttleWindowDiagonal",
-        "WallReinforced",
-        "WallReinforcedDiagonal",
-        "ReinforcedWindow",
-        "ReinforcedWindowDiagonal",
-        "WindowReinforcedDirectional",
-        "WallPlastitanium",
-        "WallPlastitaniumIndestructible",
-        "WallPlastitaniumDiagonal",
-        "WallPlastitaniumDiagonalIndestructible",
-        "PlastitaniumWindowBase",
-        "PlastitaniumWindowSquareBase",
-        "PlastitaniumWindow",
-        "PlastitaniumWindowIndestructible",
-        "PlastitaniumWindowDiagonalBase",
-        "PlastitaniumWindowDiagonal",
-        "PlastitaniumWindowDiagonalIndestructible",
-    };
-
-    private static readonly HashSet<string> ProtectTransparentPrototypeIds = new()
-    {
-        "ShuttleWindow",
-        "ShuttleWindowDiagonal",
-        "ReinforcedWindow",
-        "ReinforcedWindowDiagonal",
-        "WindowReinforcedDirectional",
-        "PlastitaniumWindowBase",
-        "PlastitaniumWindowSquareBase",
-        "PlastitaniumWindow",
-        "PlastitaniumWindowIndestructible",
-        "PlastitaniumWindowDiagonalBase",
-        "PlastitaniumWindowDiagonal",
-        "PlastitaniumWindowDiagonalIndestructible",
-    };
 
     public override void Initialize()
     {
@@ -78,13 +35,10 @@ public bool TrySetPaint(EntityUid uid, Color color, bool remove)
     public int PaintGrid(EntityUid gridUid, Color color, bool remove)
     {
         var count = 0;
-        var query = EntityQueryEnumerator<TransformComponent>();
+        var enumerator = Transform(gridUid).ChildEnumerator;
 
-        while (query.MoveNext(out var uid, out var transform))
+        while (enumerator.MoveNext(out var uid))
         {
-            if (transform.GridUid != gridUid)
-                continue;
-
             if (TrySetPaint(uid, color, remove))
                 count++;
         }
@@ -128,21 +82,7 @@ private bool TryGetPaintSettings(EntityUid uid, out bool protectTransparent)
         }
 
         protectTransparent = false;
-
-        if (!TryPrototype(uid, out var prototype) || prototype == null)
-            return false;
-
-        var isPaintable = false;
-        foreach (var (id, _) in _prototype.EnumerateAllParents<EntityPrototype>(prototype.ID, includeSelf: true))
-        {
-            isPaintable |= PaintablePrototypeIds.Contains(id);
-            protectTransparent |= ProtectTransparentPrototypeIds.Contains(id);
-
-            if (isPaintable && protectTransparent)
-                return true;
-        }
-
-        return isPaintable;
+        return false;
     }
 
     private void OnPaintRequest(WallPaintRequestEvent ev, EntitySessionEventArgs args)
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index b248bd4bac5..4fa211663ec 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -320,7 +320,7 @@
     - Wall
   - type: Sprite
     sprite: Structures/Walls/plastitanium.rsi
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
   - type: Icon
     sprite: Structures/Walls/plastitanium.rsi
   - type: IconSmooth
@@ -402,7 +402,7 @@
     drawdepth: Walls
     sprite: Structures/Walls/plastitanium_diagonal.rsi
     state: state0
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
   - type: IconSmooth
     mode: Diagonal
     key: walls
@@ -442,7 +442,7 @@
   components:
   - type: Sprite
     sprite: Structures/Walls/solid.rsi
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
   - type: Icon
     sprite: Structures/Walls/solid.rsi
     state: rgeneric
@@ -525,7 +525,7 @@
     drawdepth: Walls
     sprite: Structures/Walls/reinforced_diagonal.rsi
     state: state0
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
   - type: IconSmooth
     mode: Diagonal
     key: walls
@@ -649,7 +649,7 @@
     drawdepth: Walls
     sprite: Structures/Walls/shuttle_diagonal.rsi
     state: state0
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
   - type: IconSmooth
     mode: Diagonal
     key: walls
@@ -703,7 +703,7 @@
     resistance: 5
   - type: Sprite
     sprite: Structures/Walls/shuttle.rsi
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
   - type: Icon
     sprite: Structures/Walls/shuttle.rsi
     state: full
@@ -757,7 +757,7 @@
     fx: EffectRCDDeconstruct8
   - type: Sprite
     sprite: Structures/Walls/shuttleinterior.rsi
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
   - type: Icon
     sprite: Structures/Walls/shuttleinterior.rsi
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
index 5dc4c69e4e4..5c5af433d3a 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -17,7 +17,7 @@
         collection: GlassSmack
   - type: WallMount
     arc: 360 # interact despite grilles
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
     protectTransparent: true
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index c55339f830a..c06d7c913d5 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -6,7 +6,7 @@
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Windows/reinforced_window.rsi
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
     protectTransparent: true
   - type: Icon
     sprite: Structures/Windows/reinforced_window.rsi
@@ -78,7 +78,7 @@
   - type: Sprite
     sprite: Structures/Windows/directional.rsi
     state: reinforced_window
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
     protectTransparent: true
   - type: Icon
     sprite: Structures/Windows/directional.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index 50be2c2034b..c99bf387b44 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -6,7 +6,7 @@
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Windows/shuttle_window.rsi
-  - type: PaintableWall
+  - type: PaintableWall # Forge-Change
     protectTransparent: true
   - type: Icon
     sprite: Structures/Windows/shuttle_window.rsi
diff --git a/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl b/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl
index f690a470e89..9f62510fd76 100644
--- a/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl
+++ b/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl
@@ -6,12 +6,13 @@ uniform highp float opaqueAlphaThreshold;
 
 void fragment() {
     highp vec4 base = zTexture(UV);
-    highp float paintAmount = paintColor.a;
+    highp float paintAmount = paintColor.a * smoothstep(0.0, opaqueAlphaThreshold, base.a);
 
-    if (protectTransparency && base.a < opaqueAlphaThreshold) {
+    if (protectTransparency && base.a <= 0.0) {
         paintAmount = 0.0;
     }
 
-    highp vec3 darkened = min(base.rgb, paintColor.rgb);
-    COLOR = vec4(mix(base.rgb, darkened, paintAmount), base.a);
+    highp float luma = dot(base.rgb, vec3(0.299, 0.587, 0.114));
+    highp vec3 tinted = paintColor.rgb * luma;
+    COLOR = vec4(mix(base.rgb, tinted, paintAmount), base.a);
 }

From 59c240702389195e399910c271043a2661335a26 Mon Sep 17 00:00:00 2001
From: theg33ka <erik6996@gmail.com>
Date: Sat, 11 Jul 2026 12:31:00 +0700
Subject: [PATCH 4/5] Clamp wall paint color range

---
 .../WallPaint/UI/WallPaintWindow.xaml.cs      | 10 ++++-
 .../WallPaint/WallPaintPlacementSystem.cs     |  4 +-
 .../_Forge/WallPaint/FillWallPaintCommand.cs  |  2 +
 .../_Forge/WallPaint/WallPaintSystem.cs       |  2 +-
 .../_Forge/WallPaint/WallPaintColor.cs        | 27 +++++++++++++
 .../_Forge/WallPaint/WallPaintColorTest.cs    | 38 +++++++++++++++++++
 6 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 Content.Shared/_Forge/WallPaint/WallPaintColor.cs
 create mode 100644 Content.Tests/Shared/_Forge/WallPaint/WallPaintColorTest.cs

diff --git a/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs b/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
index 7d4c4a2fa09..d8d6b0ba8cb 100644
--- a/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
+++ b/Content.Client/_Forge/WallPaint/UI/WallPaintWindow.xaml.cs
@@ -1,6 +1,9 @@
+using Content.Shared._Forge.WallPaint;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Maths;
 
 namespace Content.Client._Forge.WallPaint.UI;
 
@@ -17,12 +20,17 @@ public WallPaintWindow()
         IoCManager.InjectDependencies(this);
 
         _wallPaint = _entity.System<WallPaintPlacementSystem>();
+        ColorPicker.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv;
         ColorPicker.Color = _wallPaint.Color;
         ErasePaint.Pressed = _wallPaint.Erase;
 
         ColorPicker.OnColorChanged += color =>
         {
-            _wallPaint.SetColor(color);
+            var clamped = WallPaintColor.Clamp(color);
+            if (!MathHelper.CloseToPercent(color, clamped))
+                ColorPicker.Color = clamped;
+
+            _wallPaint.SetColor(clamped);
         };
 
         ErasePaint.OnToggled += args => _wallPaint.SetErase(args.Pressed);
diff --git a/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs b/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
index 2896425b4b9..49b4ca53a2f 100644
--- a/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
+++ b/Content.Client/_Forge/WallPaint/WallPaintPlacementSystem.cs
@@ -32,7 +32,7 @@ public sealed partial class WallPaintPlacementSystem : EntitySystem
     private EntityQuery<ClickableComponent> _clickQuery;
     private PlacementSnapshot? _previousPlacement;
     private bool _previousDecalsActive;
-    private Color _color = Color.FromHex("#8B0000CC");
+    private Color _color = WallPaintColor.Clamp(Color.FromHex("#8B0000CC"));
     private bool _active;
     private bool _erase;
 
@@ -86,7 +86,7 @@ public void Deactivate()
 
     public void SetColor(Color color)
     {
-        _color = color;
+        _color = WallPaintColor.Clamp(color);
     }
 
     public void SetErase(bool erase)
diff --git a/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs b/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
index c2719bc6bc7..bb61be4e61f 100644
--- a/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
+++ b/Content.Server/_Forge/WallPaint/FillWallPaintCommand.cs
@@ -1,4 +1,5 @@
 using Content.Server.Administration;
+using Content.Shared._Forge.WallPaint;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
@@ -62,6 +63,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             color = parsed.Value;
+            color = WallPaintColor.Clamp(color);
         }
 
         var wallPaint = _systemManager.GetEntitySystem<WallPaintSystem>();
diff --git a/Content.Server/_Forge/WallPaint/WallPaintSystem.cs b/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
index 2db3de6be33..0d20dfa8e92 100644
--- a/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
+++ b/Content.Server/_Forge/WallPaint/WallPaintSystem.cs
@@ -26,7 +26,7 @@ public bool TrySetPaint(EntityUid uid, Color color, bool remove)
             return RemComp<WallPaintComponent>(uid);
 
         var paint = EnsureComp<WallPaintComponent>(uid);
-        paint.Color = color;
+        paint.Color = WallPaintColor.Clamp(color);
         paint.ProtectTransparent = protectTransparent;
         Dirty(uid, paint);
         return true;
diff --git a/Content.Shared/_Forge/WallPaint/WallPaintColor.cs b/Content.Shared/_Forge/WallPaint/WallPaintColor.cs
new file mode 100644
index 00000000000..c049ee6f520
--- /dev/null
+++ b/Content.Shared/_Forge/WallPaint/WallPaintColor.cs
@@ -0,0 +1,27 @@
+using System.Numerics;
+using Robust.Shared.Maths;
+
+namespace Content.Shared._Forge.WallPaint;
+
+public static class WallPaintColor
+{
+    public const float MinSaturation = 0f;
+    public const float MaxSaturation = 0.70f;
+    public const float MinValue = 0.10f;
+    public const float MaxValue = 1f;
+
+    public static Color Clamp(Color color)
+    {
+        var hsv = Color.ToHsv(color);
+        var saturation = MathHelper.Clamp(hsv.Y, MinSaturation, MaxSaturation);
+        var value = MathHelper.Clamp(hsv.Z, MinValue, MaxValue);
+
+        if (MathHelper.CloseTo(saturation, hsv.Y) &&
+            MathHelper.CloseTo(value, hsv.Z))
+        {
+            return color;
+        }
+
+        return Color.FromHsv(new Vector4(hsv.X, saturation, value, hsv.W));
+    }
+}
diff --git a/Content.Tests/Shared/_Forge/WallPaint/WallPaintColorTest.cs b/Content.Tests/Shared/_Forge/WallPaint/WallPaintColorTest.cs
new file mode 100644
index 00000000000..73559056b49
--- /dev/null
+++ b/Content.Tests/Shared/_Forge/WallPaint/WallPaintColorTest.cs
@@ -0,0 +1,38 @@
+using Content.Shared._Forge.WallPaint;
+using NUnit.Framework;
+using Robust.Shared.Maths;
+
+namespace Content.Tests.Shared._Forge.WallPaint;
+
+[TestFixture]
+public sealed class WallPaintColorTest
+{
+    [Test]
+    public void ClampLimitsSaturation()
+    {
+        var clamped = WallPaintColor.Clamp(Color.Red);
+        var hsv = Color.ToHsv(clamped);
+
+        Assert.That(hsv.Y, Is.EqualTo(WallPaintColor.MaxSaturation).Within(0.0001f));
+        Assert.That(hsv.Z, Is.EqualTo(1f).Within(0.0001f));
+    }
+
+    [Test]
+    public void ClampLimitsMinimumValue()
+    {
+        var clamped = WallPaintColor.Clamp(Color.Black);
+        var hsv = Color.ToHsv(clamped);
+
+        Assert.That(hsv.Y, Is.EqualTo(0f).Within(0.0001f));
+        Assert.That(hsv.Z, Is.EqualTo(WallPaintColor.MinValue).Within(0.0001f));
+    }
+
+    [Test]
+    public void ClampKeepsValidColor()
+    {
+        var color = Color.FromHsv(new(0.5f, 0.35f, 0.5f, 0.8f));
+        var clamped = WallPaintColor.Clamp(color);
+
+        Assert.That(MathHelper.CloseToPercent(clamped, color));
+    }
+}

From 5e4070ddb5e0e53f809eb41e2a7a94ddf0ba6d8c Mon Sep 17 00:00:00 2001
From: theg33ka <erik6996@gmail.com>
Date: Sat, 11 Jul 2026 23:22:27 +0700
Subject: [PATCH 5/5] Optimize wall paint rendering

---
 .../WallPaint/WallPaintVisualsSystem.cs       | 127 +++++++++++++-----
 .../_Forge/Shaders/wall_paint_darken.swsl     |   2 -
 2 files changed, 96 insertions(+), 33 deletions(-)

diff --git a/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs b/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
index 337f388b6db..05410e20f5d 100644
--- a/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
+++ b/Content.Client/_Forge/WallPaint/WallPaintVisualsSystem.cs
@@ -3,6 +3,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.GameStates;
+using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client._Forge.WallPaint;
@@ -15,6 +16,7 @@ public sealed partial class WallPaintVisualsSystem : EntitySystem
     private const float OpaqueAlphaThreshold = 0.95f;
 
     private readonly Dictionary<EntityUid, PaintShaderState> _shaderStates = new();
+    private readonly Dictionary<PaintShaderKey, CachedPaintShader> _shaderCache = new();
 
     public override void Initialize()
     {
@@ -31,6 +33,12 @@ public override void Shutdown()
             ClearShader(uid);
         }
 
+        foreach (var cached in _shaderCache.Values)
+        {
+            cached.Shader.Dispose();
+        }
+
+        _shaderCache.Clear();
         base.Shutdown();
     }
 
@@ -60,23 +68,64 @@ private void UpdateShader(EntityUid uid, WallPaintComponent paint, SpriteCompone
         if (!Resolve(uid, ref sprite, false))
             return;
 
+        var key = new PaintShaderKey(paint.Color, paint.ProtectTransparent);
+        PaintShaderKey? previousKey = null;
+
         if (!_shaderStates.TryGetValue(uid, out var state))
         {
-            state = new PaintShaderState(
-                _prototype.Index<ShaderPrototype>(ShaderPrototypeId).InstanceUnique(),
-                sprite.PostShader,
-                sprite.GetScreenTexture,
-                sprite.RaiseShaderEvent);
-            _shaderStates[uid] = state;
+            state = new PaintShaderState(key, AcquireShader(key));
+            _shaderStates.Add(uid, state);
+        }
+        else if (state.Key != key)
+        {
+            previousKey = state.Key;
+            state.Key = key;
+            state.Shader = AcquireShader(key);
+        }
+
+        var layerIndex = 0;
+        foreach (var layer in sprite.AllLayers.Cast<SpriteComponent.Layer>())
+        {
+            if (layerIndex >= state.PreviousLayers.Count)
+                state.PreviousLayers.Add(new LayerShaderState(layer.Shader, layer.ShaderPrototype));
+
+            sprite.LayerSetShader(layerIndex, state.Shader, ShaderPrototypeId);
+            layerIndex++;
+        }
+
+        if (previousKey is { } oldKey)
+            ReleaseShader(oldKey);
+    }
+
+    private ShaderInstance AcquireShader(PaintShaderKey key)
+    {
+        if (!_shaderCache.TryGetValue(key, out var cached))
+        {
+            var shader = _prototype.Index<ShaderPrototype>(ShaderPrototypeId).InstanceUnique();
+            shader.SetParameter("paintColor", key.Color);
+            shader.SetParameter("protectTransparency", key.ProtectTransparent);
+            shader.SetParameter("opaqueAlphaThreshold", OpaqueAlphaThreshold);
+            shader.MakeImmutable();
+
+            cached = new CachedPaintShader(shader);
+            _shaderCache.Add(key, cached);
         }
 
-        state.Shader.SetParameter("paintColor", paint.Color);
-        state.Shader.SetParameter("protectTransparency", paint.ProtectTransparent);
-        state.Shader.SetParameter("opaqueAlphaThreshold", OpaqueAlphaThreshold);
+        cached.ReferenceCount++;
+        return cached.Shader;
+    }
+
+    private void ReleaseShader(PaintShaderKey key)
+    {
+        if (!_shaderCache.TryGetValue(key, out var cached))
+            return;
 
-        sprite.PostShader = state.Shader;
-        sprite.GetScreenTexture = false;
-        sprite.RaiseShaderEvent = false;
+        cached.ReferenceCount--;
+        if (cached.ReferenceCount > 0)
+            return;
+
+        _shaderCache.Remove(key);
+        cached.Shader.Dispose();
     }
 
     private void ClearShader(EntityUid uid)
@@ -84,35 +133,51 @@ private void ClearShader(EntityUid uid)
         if (!_shaderStates.Remove(uid, out var state))
             return;
 
-        if (!TerminatingOrDeleted(uid) &&
-            TryComp(uid, out SpriteComponent? sprite) &&
-            sprite.PostShader == state.Shader)
+        if (!TerminatingOrDeleted(uid) && TryComp(uid, out SpriteComponent? sprite))
         {
-            sprite.PostShader = state.PreviousShader;
-            sprite.GetScreenTexture = state.PreviousGetScreenTexture;
-            sprite.RaiseShaderEvent = state.PreviousRaiseShaderEvent;
+            var count = Math.Min(state.PreviousLayers.Count, sprite.AllLayers.Count());
+            for (var i = 0; i < count; i++)
+            {
+                var previous = state.PreviousLayers[i];
+                if (previous.Shader != null)
+                    sprite.LayerSetShader(i, previous.Shader, previous.Prototype?.Id);
+                else if (previous.Prototype is { } prototype)
+                    sprite.LayerSetShader(i, prototype.Id);
+                else
+                    sprite.LayerSetShader(i, null, null);
+            }
         }
 
-        state.Shader.Dispose();
+        ReleaseShader(state.Key);
     }
 
+    private readonly record struct PaintShaderKey(Color Color, bool ProtectTransparent);
+
+    private readonly record struct LayerShaderState(
+        ShaderInstance? Shader,
+        ProtoId<ShaderPrototype>? Prototype);
+
     private sealed class PaintShaderState
+    {
+        public PaintShaderKey Key;
+        public ShaderInstance Shader;
+        public readonly List<LayerShaderState> PreviousLayers = new();
+
+        public PaintShaderState(PaintShaderKey key, ShaderInstance shader)
+        {
+            Key = key;
+            Shader = shader;
+        }
+    }
+
+    private sealed class CachedPaintShader
     {
         public readonly ShaderInstance Shader;
-        public readonly ShaderInstance? PreviousShader;
-        public readonly bool PreviousGetScreenTexture;
-        public readonly bool PreviousRaiseShaderEvent;
-
-        public PaintShaderState(
-            ShaderInstance shader,
-            ShaderInstance? previousShader,
-            bool previousGetScreenTexture,
-            bool previousRaiseShaderEvent)
+        public int ReferenceCount;
+
+        public CachedPaintShader(ShaderInstance shader)
         {
             Shader = shader;
-            PreviousShader = previousShader;
-            PreviousGetScreenTexture = previousGetScreenTexture;
-            PreviousRaiseShaderEvent = previousRaiseShaderEvent;
         }
     }
 }
diff --git a/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl b/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl
index 9f62510fd76..1f7c73f26f9 100644
--- a/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl
+++ b/Resources/Textures/_Forge/Shaders/wall_paint_darken.swsl
@@ -1,5 +1,3 @@
-light_mode unshaded;
-
 uniform highp vec4 paintColor;
 uniform bool protectTransparency;
 uniform highp float opaqueAlphaThreshold;