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

diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 27adeeef4bf1d06d421ceaeb81c491f33990761e..dd6ebe0653c99c14b0e3b2eb3271bbbe894c3a09 100644 (file)
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -225,7 +225,7 @@ namespace Content.IntegrationTests.Tests
 
                 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 @@ namespace Content.IntegrationTests.Tests
 
                 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
index 77de88ae283806666b9b0088b33287decd7a0f0f..bf277d7b2551ff3f3b54c07eac36bacb4e266d29 100644 (file)
--- a/Content.Server/Interaction/TilePryCommand.cs
+++ b/Content.Server/Interaction/TilePryCommand.cs
@@ -66,8 +66,8 @@ namespace Content.Server.Interaction
 
                     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
index 07efa175e251fdf83b8829c57517655b23d78471..ad67551ca0910574f5e62879be5b5a961739a125 100644 (file)
--- 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
index 27a8bd4a58aacf091b57019662e73906bbc6cda7..56c45f72254bbc04ac8b320b65da76767d06747e 100644 (file)
--- 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
index e02e235238a6ff9591972bf527f98292635a0649..94e69fbd5cae6ac5332a3d87f2ba0610d10f50b0 100644 (file)
--- 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
index ad2931671c74da7367b212be46e6276c1332f7af..f1afe2768e09172dde8b88bc32ecd1a8ff68c75b 100644 (file)
--- 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
index 9b285ff27def5ff80232f874689493d6c01fd21d..f46dd2989d866f49d8c20965b1672ee7c69edf0f 100644 (file)
--- 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
index 3800af64873b88a6b972d2f2bb1218a72f06e44d..5ba5ec07a2226484736dbcd1e56cf6a0ea013909 100644 (file)
--- 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