Merge pull request #141 from FireNameFN/FixArtifactDestroysWalls

Fix artifact destroy walls
Corvax-Frontier · May 10, 2024 · 047c455 · 047c455
2 parents be7a1f1 + d1d9377
commit 047c455
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -45,6 +45,8 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto
         [DataField]
         public PrototypeFlags<ToolQualityPrototype> DeconstructTools { get; set; } = new();
 
+        public bool CanCrowbar => DeconstructTools.Contains(PryingToolQuality);
+
         // Delta V
         [DataField("canShovel")] public bool CanShovel { get; private set; }
         //Delta V

diff --git a/Content.Shared/Maps/TileSystem.cs b/Content.Shared/Maps/TileSystem.cs
@@ -86,7 +86,7 @@ public bool PryTile(Vector2i indices, EntityUid gridId)
         return PryTile(tileRef);
     }
 
-	public bool PryTile(TileRef tileRef)
+    public bool PryTile(TileRef tileRef)
     {
         return PryTile(tileRef, false);
     }
@@ -100,6 +100,9 @@ public bool PryTile(TileRef tileRef, bool pryPlating)
 
         var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.TypeId];
 
+        if (!tileDef.CanCrowbar)
+            return false;
+
         return DeconstructTile(tileRef);
     }
     // Delta V