Revert "Nyano port of digging (DeltaV-Station#400)"

This reverts commit 089398d
NullWanderer · Jul 1, 2024 · 068ef53 · 068ef53
1 parent a03615f
commit 068ef53
Show file tree

Hide file tree

Showing 30 changed files with 3 additions and 370 deletions.
diff --git a/Content.Server/Nyanotrasen/Digging/DiggingSystem.cs b/Content.Server/Nyanotrasen/Digging/DiggingSystem.cs
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -45,10 +45,6 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto
         [DataField]
         public PrototypeFlags<ToolQualityPrototype> DeconstructTools { get; set; } = new();
 
-        // Delta V
-        [DataField("canShovel")] public bool CanShovel { get; private set; }
-        //Delta V
-
         /// <remarks>
         /// Legacy AF but nice to have.
         /// </remarks>

diff --git a/Content.Shared/Maps/TileSystem.cs b/Content.Shared/Maps/TileSystem.cs
@@ -104,22 +104,7 @@ public bool PryTile(TileRef tileRef, bool pryPlating)
 
         return DeconstructTile(tileRef);
     }
-    // Delta V
-    public bool DigTile(TileRef tileRef)
-    {
-        var tile = tileRef.Tile;
-
-        if (tile.IsEmpty)
-            return false;
 
-        var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.TypeId];
-
-        if (!tileDef.CanShovel)
-            return false;
-
-        return DeconstructTile(tileRef);
-    }
-    // Delta V
     public bool ReplaceTile(TileRef tileref, ContentTileDefinition replacementTile)
     {
         if (!TryComp<MapGridComponent>(tileref.GridUid, out var grid))

diff --git a/Content.Shared/Nyanotrasen/Digging/DiggingEvents.cs b/Content.Shared/Nyanotrasen/Digging/DiggingEvents.cs
diff --git a/Content.Shared/Nyanotrasen/Digging/EarthDiggingComponent.cs b/Content.Shared/Nyanotrasen/Digging/EarthDiggingComponent.cs
diff --git a/Resources/Audio/Nyanotrasen/Items/attributions.yml b/Resources/Audio/Nyanotrasen/Items/attributions.yml
diff --git a/Resources/Audio/Nyanotrasen/Items/shovel_dig.ogg b/Resources/Audio/Nyanotrasen/Items/shovel_dig.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -562,13 +562,6 @@
       Wood: 50
   - type: StaticPrice
     price: 25
-  # Delta V: Adds tool quality for digging
-  - type: Tool
-    qualities:
-      - Digging
-    useSound:
-      path: /Audio/Nyanotrasen/Items/shovel_dig.ogg
-  - type: EarthDigging
   - type: Shovel
 
 - type: entity

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/tiles.yml
diff --git a/Resources/Prototypes/Nyanotrasen/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Nyanotrasen/Stacks/floor_tile_stacks.yml
diff --git a/Resources/Prototypes/Nyanotrasen/Tiles/floors.yml b/Resources/Prototypes/Nyanotrasen/Tiles/floors.yml
diff --git a/Resources/Prototypes/Nyanotrasen/tool_qualities.yml b/Resources/Prototypes/Nyanotrasen/tool_qualities.yml
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
@@ -201,7 +201,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemBrassFilled
   heatCapacity: 10000
-  
+
 - type: tile
   id: FloorBrassReebe
   name: tiles-brass-floor-reebe
@@ -1446,7 +1446,6 @@
   sprite: /Textures/Tiles/grass.png
   baseTurf: FloorDirt
   isSubfloor: true
-  canShovel: true #DV
   footstepSounds:
     collection: FootstepGrass
   itemDrop: FloorTileItemGrass
@@ -1459,7 +1458,6 @@
   sprite: /Textures/Tiles/grassjungle.png
   baseTurf: FloorDirt
   isSubfloor: true
-  canShovel: true # Delta V
   footstepSounds:
     collection: FootstepGrass
   itemDrop: FloorTileItemGrassJungle
@@ -1478,10 +1476,8 @@
   - 1.0
   baseTurf: FloorDirt
   isSubfloor: true
-  canShovel: true # Delta V
   footstepSounds:
     collection: FootstepGrass
-  itemDrop: FloorTileItemGrassDark # Delta V
   heatCapacity: 10000
   weather: true
 
@@ -1497,10 +1493,8 @@
   - 1.0
   baseTurf: FloorDirt
   isSubfloor: true
-  canShovel: true # Delta V
   footstepSounds:
     collection: FootstepGrass
-  itemDrop: FloorTileItemGrassLight
   heatCapacity: 10000
   weather: true
 
@@ -1516,12 +1510,10 @@
   - 1.0
   baseTurf: Plating
   isSubfloor: true
-  canShovel: true # Delta V
   footstepSounds:
     collection: FootstepAsteroid
-  itemDrop: FloorTileItemDirt # Delta V
   heatCapacity: 10000
-  weather: True
+  weather: true
 
 # Asteroid
 
@@ -1940,4 +1932,4 @@
   barestepSounds:
     collection: BarestepWood
   itemDrop: FloorTileItemWoodLarge
-  heatCapacity: 10000
+  heatCapacity: 10000