allow decals to be removed from placement menu (#9843)

space-wizards · Jul 18, 2022 · f8b8b83 · f8b8b83
1 parent 9665a11
commit f8b8b83
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs b/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Client.Stylesheets;
 using Content.Shared.Decals;
 using Robust.Client.AutoGenerated;
@@ -179,7 +179,8 @@ public void Populate()
         _decals = new Dictionary<string, Texture>();
         foreach (var decalPrototype in prototypes)
         {
-            _decals.Add(decalPrototype.ID, decalPrototype.Sprite.Frame0());
+            if (decalPrototype.ShowMenu)
+                _decals.Add(decalPrototype.ID, decalPrototype.Sprite.Frame0());
         }
 
         RefreshList();

diff --git a/Content.Shared/Decals/DecalPrototype.cs b/Content.Shared/Decals/DecalPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Decals
@@ -9,5 +9,6 @@ public sealed class DecalPrototype : IPrototype
         [IdDataFieldAttribute] public string ID { get; } = null!;
         [DataField("sprite")] public SpriteSpecifier Sprite { get; } = SpriteSpecifier.Invalid;
         [DataField("tags")] public List<string> Tags = new();
+        [DataField("showMenu")] public bool ShowMenu = true;
     }
 }
diff --git a/Resources/Prototypes/Decals/markings.yml b/Resources/Prototypes/Decals/markings.yml
@@ -142,13 +142,15 @@
 
 - type: decal
   id: WarnEnd
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warn_end
 
 - type: decal
   id: WarnEndGreyscale
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
@@ -174,69 +176,79 @@
 
 - type: decal
   id: WarningLine
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warningline
 
 - type: decal
   id: WarningLineGreyscale
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warningline_greyscale
 
 - type: decal
   id: WarningLineCorner
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warninglinecorner
 
 - type: decal
   id: WarningLineCornerGreyscale
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warninglinecorner_greyscale
 
 - type: decal
   id: WarningLineCornerFlipped
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warninglinecorner_flipped
 
 - type: decal
   id: WarningLineCornerFlippedGreyscale
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warninglinecorner_flipped_greyscale
 
 - type: decal
   id: WarnCorner
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warn_corner
 
 - type: decal
   id: WarnCornerGreyscale
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warn_corner_greyscale
 
 - type: decal
   id: WarnCornerFlipped
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi
     state: warn_corner_flipped
 
 - type: decal
   id: WarnCornerFlippedGreyscale
+  showMenu: false
   tags: ["station", "markings"]
   sprite:
     sprite: Decals/markings.rsi