Generalize tile prying to any tool quality

Content.Server/Interaction/TilePryCommand.cs

@@ -7,9 +7,6 @@
 
 namespace Content.Server.Interaction
 {
-    /// <summary>
-    /// <see cref="Shared.Tools.Components.TilePryingComponent.TryPryTile"/>
-    /// </summary>
     [AdminCommand(AdminFlags.Debug)]
     sealed class TilePryCommand : IConsoleCommand
     {

Content.Server/Tools/ToolSystem.Welder.cs

@@ -70,7 +70,7 @@ public void TryTurnOn(Entity<WelderComponent> entity, ref ItemToggleActivateAtte
             _solutionContainer.RemoveReagent(entity.Comp.FuelSolution.Value, entity.Comp.FuelReagent, entity.Comp.FuelLitCost);
 
             // Logging
-            _adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} on");
+            AdminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} on");
 
             _ignitionSource.SetIgnited(entity.Owner);
 
@@ -88,7 +88,7 @@ public void TryTurnOn(Entity<WelderComponent> entity, ref ItemToggleActivateAtte
         public void TurnOff(Entity<WelderComponent> entity, ref ItemToggleDeactivateAttemptEvent args)
         {
             // Logging
-            _adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} off");
+            AdminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} off");
 
             _ignitionSource.SetIgnited(entity.Owner, false);
 

Content.Server/Tools/ToolSystem.cs

@@ -4,7 +4,6 @@
 using Content.Server.Tools.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
 
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
@@ -13,21 +12,16 @@ namespace Content.Server.Tools
     // TODO move tool system to shared, and make it a friend of Tool Component.
     public sealed partial class ToolSystem : SharedToolSystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
-        [Dependency] private readonly AppearanceSystem _appearanceSystem = default!;
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedPointLightSystem _light = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
         [Dependency] private readonly TransformSystem _transformSystem = default!;
 
         public override void Initialize()
         {
             base.Initialize();
 
-            InitializeLatticeCutting();
             InitializeWelders();
         }
 

Content.Shared/Maps/ContentTileDefinition.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Atmos;
 using Content.Shared.Movement.Systems;
+using Content.Shared.Tools;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -12,6 +13,9 @@ namespace Content.Shared.Maps
     [Prototype("tile")]
     public sealed partial class ContentTileDefinition : IPrototype, IInheritingPrototype, ITileDefinition
     {
+        [ValidatePrototypeId<ToolQualityPrototype>]
+        public const string PryingToolQuality = "Prying";
+
         public const string SpaceID = "Space";
 
         [ParentDataFieldAttribute(typeof(AbstractPrototypeIdArraySerializer<ContentTileDefinition>))]
@@ -38,14 +42,13 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto
         [DataField("baseTurf")]
         public string BaseTurf { get; private set; } = string.Empty;
 
-        [DataField("canCrowbar")] public bool CanCrowbar { get; private set; }
-
-        /// <summary>
-        /// Whether this tile can be pried by an advanced prying tool if not pryable otherwise.
-        /// </summary>
-        [DataField("canAxe")] public bool CanAxe { get; private set; }
+        [DataField]
+        public PrototypeFlags<ToolQualityPrototype> DeconstructTools { get; set; } = new();
 
-        [DataField("canWirecutter")] public bool CanWirecutter { get; private set; }
+        /// <remarks>
+        /// Legacy AF but nice to have.
+        /// </remarks>
+        public bool CanCrowbar => DeconstructTools.Contains(PryingToolQuality);
 
         /// <summary>
         /// These play when the mob has shoes on.

Content.Shared/Maps/TileSystem.cs

@@ -65,22 +65,7 @@ public bool PryTile(TileRef tileRef, bool pryPlating)
 
         var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.TypeId];
 
-        if (!tileDef.CanCrowbar && !(pryPlating && tileDef.CanAxe))
-            return false;
-
-        return DeconstructTile(tileRef);
-    }
-
-    public bool CutTile(TileRef tileRef)
-    {
-        var tile = tileRef.Tile;
-
-        if (tile.IsEmpty)
-            return false;
-
-        var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.TypeId];
-
-        if (!tileDef.CanWirecutter)
+        if (!tileDef.CanCrowbar)
             return false;
 
         return DeconstructTile(tileRef);
@@ -112,7 +97,7 @@ public bool ReplaceTile(TileRef tileref, ContentTileDefinition replacementTile,
         return true;
     }
 
-    private bool DeconstructTile(TileRef tileRef)
+    public bool DeconstructTile(TileRef tileRef)
     {
         if (tileRef.Tile.IsEmpty)
             return false;

Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs

@@ -0,0 +1,44 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Tools.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Tools.Components;
+
+/// <summary>
+/// This is used for entities with <see cref="ToolComponent"/> that are additionally
+/// able to modify tiles.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedToolSystem))]
+public sealed partial class ToolTileCompatibleComponent : Component
+{
+    /// <summary>
+    /// The time it takes to modify the tile.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Whether or not the tile being modified must be unobstructed
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool RequiresUnobstructed = true;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class TileToolDoAfterEvent : DoAfterEvent
+{
+    public NetCoordinates Coordinates;
+
+    public TileToolDoAfterEvent(NetCoordinates coordinates)
+    {
+        Coordinates = coordinates;
+    }
+
+    public override DoAfterEvent Clone()
+    {
+        return this;
+    }
+}

Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs

@@ -5,7 +5,7 @@
 
 namespace Content.Shared.Tools.Systems;
 
-public abstract partial class SharedToolSystem : EntitySystem
+public abstract partial class SharedToolSystem
 {
     public void InitializeMultipleTool()
     {
@@ -57,7 +57,7 @@ public virtual void SetMultipleTool(EntityUid uid,
         if (!Resolve(uid, ref multiple, ref tool))
             return;
 
-        Dirty(multiple);
+        Dirty(uid, multiple);
 
         if (multiple.Entries.Length <= multiple.CurrentEntry)
         {