Tiles can now be modified by arbitrary tool qualities

Content.IntegrationTests/Tests/EntityTest.cs

@@ -141,7 +141,7 @@ await server.WaitPost(() =>
 
                 grid = mapManager.CreateGrid(mapId);
 
-                var tileDefinition = tileDefinitionManager["UnderPlating"];
+                var tileDefinition = tileDefinitionManager["Plating"];
                 var tile = new Tile(tileDefinition.TileId);
                 var coordinates = grid.ToCoordinates();
 
@@ -236,7 +236,7 @@ await server.WaitPost(() =>
 
                 grid = mapManager.CreateGrid(mapId);
 
-                var tileDefinition = tileDefinitionManager["UnderPlating"];
+                var tileDefinition = tileDefinitionManager["Plating"];
                 var tile = new Tile(tileDefinition.TileId);
 
                 grid.SetTile(Vector2i.Zero, tile);

Content.IntegrationTests/Tests/Fluids/PuddleTest.cs

@@ -107,7 +107,7 @@ await server.WaitPost(() =>
                 sGridId = sGrid.GridEntityId;
                 metaSystem.SetEntityPaused(sGridId, true); // See https://github.com/space-wizards/RobustToolbox/issues/1444
 
-                var tileDefinition = sTileDefinitionManager["UnderPlating"];
+                var tileDefinition = sTileDefinitionManager["Plating"];
                 var tile = new Tile(tileDefinition.TileId);
                 sCoordinates = sGrid.ToCoordinates();
 

Content.IntegrationTests/Tests/PrototypeSaveTest.cs

@@ -102,7 +102,7 @@ await server.WaitPost(() =>
 
             grid = mapManager.CreateGrid(mapId);
 
-            var tileDefinition = tileDefinitionManager["UnderPlating"];
+            var tileDefinition = tileDefinitionManager["Plating"];
             var tile = new Tile(tileDefinition.TileId);
             var coordinates = grid.ToCoordinates();
 

Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs

@@ -104,6 +104,6 @@ private void PryTile(MapGridComponent mapGrid, Vector2i tile)
         if (!mapGrid.TryGetTileRef(tile, out var tileRef))
             return;
 
-        tileRef.PryTile(_mapManager, _tileDefinitionManager, EntityManager, _robustRandom);
+        tileRef.TryDeconstructToSubFloor(_mapManager, _tileDefinitionManager, EntityManager, _robustRandom);
     }
 }

Content.Server/Chemistry/TileReactions/PryTileReaction.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Maps;
@@ -13,7 +13,7 @@ public sealed class PryTileReaction : ITileReaction
 {
     public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume)
     {
-        tile.PryTile();
+        tile.TryDeconstructToSubFloor();
         return reactVolume;
     }
 }

Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs

@@ -446,10 +446,10 @@ public void DamageFloorTile(TileRef tileRef,
             effectiveIntensity -= type.TileBreakRerollReduction;
 
             // does this have a base-turf that we can break it down to?
-            if (tileDef.BaseTurfs.Count == 0)
+            if (string.IsNullOrEmpty(tileDef.BaseTurf))
                 break;
 
-            if (_tileDefinitionManager[tileDef.BaseTurfs[^1]] is not ContentTileDefinition newDef)
+            if (_tileDefinitionManager[tileDef.BaseTurf] is not ContentTileDefinition newDef)
                 break;
 
             if (newDef.IsSpace && !canCreateVacuum)

Content.Server/Interaction/TilePryCommand.cs

@@ -64,9 +64,10 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                     var coordinates = mapGrid.GridTileToLocal(tile.GridIndices);
                     var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId];
 
-                    if (!tileDef.CanCrowbar) continue;
+                    if (!tileDef.DeconstructToolQualities.Contains("Prying"))
+                        continue;
 
-                    var underplating = tileDefinitionManager["UnderPlating"];
+                    var underplating = tileDefinitionManager["Plating"];
                     mapGrid.SetTile(coordinates, new Tile(underplating.TileId));
                 }
             }

Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs

@@ -235,7 +235,7 @@ private void OnDefileAction(EntityUid uid, RevenantComponent component, Revenant
         {
             if (!tiles.TryGetValue(i, out var value))
                 continue;
-            value.PryTile();
+            value.TryDeconstructToSubFloor();
         }
 
         var lookup = _lookup.GetEntitiesInRange(uid, component.DefileRadius, LookupFlags.Approximate | LookupFlags.Anchored);

Content.Server/Tiles/FloorTileSystem.cs

@@ -86,13 +86,7 @@ private void OnAfterInteract(EntityUid uid, FloorTileComponent component, AfterI
 
         public bool HasBaseTurf(ContentTileDefinition tileDef, string baseTurf)
         {
-            foreach (var tileBaseTurf in tileDef.BaseTurfs)
-            {
-                if (baseTurf == tileBaseTurf)
-                    return true;
-            }
-
-            return false;
+            return tileDef.BaseTurf == baseTurf;
         }
 
         private void PlaceAt(MapGridComponent mapGrid, EntityCoordinates location, ushort tileId, SoundSpecifier placeSound, float offset = 0)

Content.Server/Tools/Components/ToolWorksWIthTilesComponent.cs

@@ -0,0 +1,22 @@
+using System.Threading;
+using Content.Shared.Tools;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Tools.Components;
+
+[RegisterComponent]
+public sealed class ToolWorksWithTilesComponent : Component
+{
+    [ViewVariables]
+    [DataField("requiresUnobstructed")]
+    public bool RequiresUnobstructed = false;
+
+    [ViewVariables]
+    [DataField("delay")]
+    public float Delay = 0.25f;
+
+    /// <summary>
+    /// Used for do_afters.
+    /// </summary>
+    public CancellationTokenSource? CancelTokenSource = null;
+}