Completely remove every last reference to underplating. (#16559)

HellCatten · May 19, 2023 · af1d77e · af1d77e
1 parent 3b32531
commit af1d77e
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 14 deletions.
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -225,7 +225,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();
 
@@ -325,7 +325,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);

diff --git a/Content.Server/Interaction/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs
@@ -66,8 +66,8 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
 
                     if (!tileDef.CanCrowbar) continue;
 
-                    var underplating = tileDefinitionManager["UnderPlating"];
-                    mapGrid.SetTile(coordinates, new Tile(underplating.TileId));
+                    var plating = tileDefinitionManager["Plating"];
+                    mapGrid.SetTile(coordinates, new Tile(plating.TileId));
                 }
             }
         }

diff --git a/Content.Tools/test/0A.yml b/Content.Tools/test/0A.yml
@@ -22,7 +22,7 @@ tilemap:
   23: FloorWood
   24: Lattice
   25: Plating
-  26: UnderPlating
+  26: Plating
 grids:
 - settings:
     chunksize: 16

diff --git a/Content.Tools/test/0B.yml b/Content.Tools/test/0B.yml
@@ -22,7 +22,7 @@ tilemap:
   23: FloorWood
   24: Lattice
   25: Plating
-  26: UnderPlating
+  26: Plating
 grids:
 - settings:
     chunksize: 16

diff --git a/Content.Tools/test/0C.yml b/Content.Tools/test/0C.yml
@@ -28,7 +28,7 @@ tilemap:
   23: FloorWood
   24: Lattice
   25: Plating
-  26: UnderPlating
+  26: Plating
 grids:
 - settings:
     chunksize: 16

diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -512,7 +512,6 @@
       targets:
         - Lattice
         - Plating
-        - UnderPlating
   icon:
     sprite: Structures/catwalk.rsi
     state: catwalk_preview
@@ -534,7 +533,6 @@
     - !type:TileType
       targets:
         - Plating
-        - UnderPlating
   icon:
     sprite: Tiles/Misc/bananium.rsi
     state: bananium

diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -65,7 +65,6 @@
       targets:
         - Lattice
         - Plating
-        - UnderPlating
 
 - type: construction
   name: cable terminal

diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
@@ -26,7 +26,3 @@
   itemDrop: PartRodMetal1
   heatCapacity: 10000
 
-# The final step in underplating's deprecation before it gets completely wiped from the codebase.
-- type: tileAlias
-  id: UnderPlating
-  target: Plating