Remove plural BaseTurfs as a thing in favour of BaseTurf (#16560)

diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 5c90577011f80c0a706cc613bb8d1a4d51093375..9d7617d1b8601ff173cc01db868d579ae011bd38 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -467,10 +467,10 @@ public sealed partial class ExplosionSystem : EntitySystem
             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)

diff --git a/Content.Server/Maps/TileSystem.cs b/Content.Server/Maps/TileSystem.cs
index ddf5efc7f1c437a259ec62ccbd88d8fefd73e510..eba9e8e76b07ab757578c6c20e3e24d676da521e 100644 (file)
--- a/Content.Server/Maps/TileSystem.cs
+++ b/Content.Server/Maps/TileSystem.cs
@@ -79,13 +79,19 @@ public sealed class TileSystem : EntitySystem
 
     private bool DeconstructTile(TileRef tileRef)
     {
-        var indices = tileRef.GridIndices;
+        if (tileRef.Tile.IsEmpty)
+            return false;
 
         var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileRef.Tile.TypeId];
+
+        if (string.IsNullOrEmpty(tileDef.BaseTurf))
+            return false;
+
         var mapGrid = _mapManager.GetGrid(tileRef.GridUid);
 
         const float margin = 0.1f;
         var bounds = mapGrid.TileSize - margin * 2;
+        var indices = tileRef.GridIndices;
         var coordinates = mapGrid.GridTileToLocal(indices)
             .Offset(new Vector2(
                 (_robustRandom.NextFloat() - 0.5f) * bounds,
@@ -102,7 +108,7 @@ public sealed class TileSystem : EntitySystem
             _decal.RemoveDecal(tileRef.GridUid, id);
         }
 
-        var plating = _tileDefinitionManager[tileDef.BaseTurfs[^1]];
+        var plating = _tileDefinitionManager[tileDef.BaseTurf];
 
         mapGrid.SetTile(tileRef.GridIndices, new Tile(plating.TileId));
 

diff --git a/Content.Server/Tools/ToolSystem.LatticeCutting.cs b/Content.Server/Tools/ToolSystem.LatticeCutting.cs
index eb4b721d86e52a154b2eb44aa687f77a54332f1b..7f4e729f7f002e4517893d3a718dc5a917197982 100644 (file)
--- a/Content.Server/Tools/ToolSystem.LatticeCutting.cs
+++ b/Content.Server/Tools/ToolSystem.LatticeCutting.cs
@@ -34,7 +34,7 @@ public sealed partial class ToolSystem
 
         if (_tileDefinitionManager[tile.Tile.TypeId] is not ContentTileDefinition tileDef
             || !tileDef.CanWirecutter
-            || tileDef.BaseTurfs.Count == 0
+            || string.IsNullOrEmpty(tileDef.BaseTurf)
             || tile.IsBlockedTurf(true))
             return;
 
@@ -66,8 +66,8 @@ public sealed partial class ToolSystem
 
         if (_tileDefinitionManager[tile.Tile.TypeId] is not ContentTileDefinition tileDef
             || !tileDef.CanWirecutter
-            || tileDef.BaseTurfs.Count == 0
-            || _tileDefinitionManager[tileDef.BaseTurfs[^1]] is not ContentTileDefinition newDef
+            || string.IsNullOrEmpty(tileDef.BaseTurf)
+            || _tileDefinitionManager[tileDef.BaseTurf] is not ContentTileDefinition newDef
             || tile.IsBlockedTurf(true))
             return false;
 

diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index 6335c329a8cd8906e065d2d6c1053605cba55769..0fc7815d22798fa29d777562f5ce34ae6326edab 100644 (file)
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -33,7 +33,8 @@ namespace Content.Shared.Maps
 
         [DataField("isSubfloor")] public bool IsSubFloor { get; private set; }
 
-        [DataField("baseTurfs")] public List<string> BaseTurfs { get; } = new();
+        [DataField("baseTurf")]
+        public string BaseTurf { get; } = string.Empty;
 
         [DataField("canCrowbar")] public bool CanCrowbar { get; private set; }
 

diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 0720de468bbdad868892031e6f959b42bc33e214..a098eea26ab482650c2b8fa65aea7f81c7d39405 100644 (file)
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -136,13 +136,7 @@ public sealed class FloorTileSystem : EntitySystem
 
     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(EntityUid user, MapGridComponent mapGrid, EntityCoordinates location, ushort tileId, SoundSpecifier placeSound, float offset = 0)

diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 0da280c0b2645defb5563ee295f148d777e495f3..5d86d6df935c522194f1e5f8ae5d826589d376c0 100644 (file)
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -4,8 +4,7 @@
   sprite: /Textures/Tiles/steel.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -19,8 +18,7 @@
   sprite: /Textures/Tiles/steel_mini.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -34,8 +32,7 @@
   sprite: /Textures/Tiles/steel_pavement.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -49,8 +46,7 @@
   sprite: /Textures/Tiles/steel_diagonal.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -64,8 +60,7 @@
   sprite: /Textures/Tiles/steel_offset.png
   variants: 1
   placementVariants: [0]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -79,8 +74,7 @@
   sprite: /Textures/Tiles/steel_mono.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -95,8 +89,7 @@
   sprite: /Textures/Tiles/steel_pavement_vertical.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -111,8 +104,7 @@
   sprite: /Textures/Tiles/steel_herringbone.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -127,8 +119,7 @@
   sprite: /Textures/Tiles/steel_diagonal_mini.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -143,8 +134,7 @@
   sprite: /Textures/Tiles/plastic.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -158,8 +148,7 @@
   sprite: /Textures/Tiles/wood.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -175,8 +164,7 @@
   sprite: /Textures/Tiles/white.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -191,8 +179,7 @@
   sprite: /Textures/Tiles/white_mini.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -207,8 +194,7 @@
   sprite: /Textures/Tiles/white_pavement.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -223,8 +209,7 @@
   sprite: /Textures/Tiles/white_diagonal.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -239,8 +224,7 @@
   sprite: /Textures/Tiles/white_offset.png
   variants: 1
   placementVariants: [0]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -255,8 +239,7 @@
   sprite: /Textures/Tiles/white_mono.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -271,8 +254,7 @@
   sprite: /Textures/Tiles/white_pavement_vertical.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -287,8 +269,7 @@
   sprite: /Textures/Tiles/white_herringbone.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -303,8 +284,7 @@
   sprite: /Textures/Tiles/white_diagonal_mini.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -319,8 +299,7 @@
   sprite: /Textures/Tiles/white_plastic.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -335,8 +314,7 @@
   sprite: /Textures/Tiles/dark.png
   variants: 4
   placementVariants: [ 0, 1, 2, 3 ]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -350,8 +328,7 @@
   sprite: /Textures/Tiles/dark_mini.png
   variants: 4
   placementVariants: [ 0, 1, 2, 3 ]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -365,8 +342,7 @@
   sprite: /Textures/Tiles/dark_pavement.png
   variants: 4
   placementVariants: [ 0, 1, 2, 3 ]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -380,8 +356,7 @@
   sprite: /Textures/Tiles/dark_diagonal.png
   variants: 4
   placementVariants: [ 0, 1, 2, 3 ]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -395,8 +370,7 @@
   sprite: /Textures/Tiles/dark_offset.png
   variants: 1
   placementVariants: [0]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -411,8 +385,7 @@
   sprite: /Textures/Tiles/dark_mono.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -427,8 +400,7 @@
   sprite: /Textures/Tiles/dark_pavement_vertical.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -443,8 +415,7 @@
   sprite: /Textures/Tiles/dark_herringbone.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -459,8 +430,7 @@
   sprite: /Textures/Tiles/dark_diagonal_mini.png
   variants: 4
   placementVariants: [0,1,2,3]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -475,8 +445,7 @@
   sprite: /Textures/Tiles/dark_plastic.png
   variants: 4
   placementVariants: [ 0, 1, 2, 3 ]
-  baseTurfs:
-    - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -488,8 +457,7 @@
   id: FloorTechMaint
   name: tiles-techmaint-floor
   sprite: /Textures/Tiles/tech_maint.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -501,8 +469,7 @@
   id: FloorReinforced
   name: tiles-reinforced-floor
   sprite: /Textures/Tiles/reinforced.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -514,8 +481,7 @@
   id: FloorMono
   name: tiles-mono-floor
   sprite: /Textures/Tiles/mono.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -527,8 +493,7 @@
   id: FloorLino
   name: tiles-linoleum-floor
   sprite: /Textures/Tiles/lino.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -540,8 +505,7 @@
   id: FloorSteelDirty
   name: tiles-dirty-steel-floor
   sprite: /Textures/Tiles/steel_dirty.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -553,8 +517,7 @@
   id: FloorElevatorShaft
   name: tiles-elevator-shaft
   sprite: /Textures/Tiles/elevator_shaft.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -566,8 +529,7 @@
   id: FloorMetalDiamond
   name: tiles-diamond-plate-floor
   sprite: /Textures/Tiles/metaldiamond.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -579,8 +541,7 @@
   id: FloorRockVault
   name: tiles-rock-floor
   sprite: /Textures/Tiles/rock_vault.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -592,8 +553,7 @@
   id: FloorBlue
   name: tiles-blue-tile
   sprite: /Textures/Tiles/blue.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -606,8 +566,7 @@
   id: FloorFreezer
   name: tiles-freezer
   sprite: /Textures/Tiles/freezer.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -619,8 +578,7 @@
   id: FloorShowroom
   name: tiles-showroom-floor
   sprite: /Textures/Tiles/showroom.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -632,8 +590,7 @@
   id: FloorHydro
   name: tiles-hydro-floor
   sprite: /Textures/Tiles/hydro.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -647,8 +604,7 @@
   sprite: /Textures/Tiles/bar.png
   variants: 4
   placementVariants: [ 0, 1, 2, 3 ]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -660,8 +616,7 @@
   id: FloorClown
   name: tiles-clown-floor
   sprite: /Textures/Tiles/clown.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -673,8 +628,7 @@
   id: FloorMime
   name: tiles-mime-floor
   sprite: /Textures/Tiles/mime.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -686,8 +640,7 @@
   id: FloorKitchen
   name: tiles-kitchen-floor
   sprite: /Textures/Tiles/kitchen.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -699,8 +652,7 @@
   id: FloorLaundry
   name: tiles-laundry-floor
   sprite: /Textures/Tiles/laundry.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -713,8 +665,7 @@
   id: FloorArcadeBlue
   name: tiles-blue-arcade-floor
   sprite: /Textures/Tiles/arcadeblue.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -729,8 +680,7 @@
   id: FloorArcadeBlue2
   name: tiles-blue-arcade-floor
   sprite: /Textures/Tiles/arcadeblue2.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -745,8 +695,7 @@
   id: FloorArcadeRed
   name: tiles-red-arcade-floor
   sprite: /Textures/Tiles/arcadered.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -761,8 +710,7 @@
   id: FloorEighties
   name: tiles-eighties-floor
   sprite: /Textures/Tiles/eighties.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -777,8 +725,7 @@
   id: FloorCarpetClown
   name: tiles-clown-carpet-floor
   sprite: /Textures/Tiles/carpetclown.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -793,8 +740,7 @@
   id: FloorCarpetOffice
   name: tiles-office-carpet-floor
   sprite: /Textures/Tiles/carpetoffice.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -811,8 +757,7 @@
   sprite: /Textures/Tiles/boxing.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -827,8 +772,7 @@
   sprite: /Textures/Tiles/gym.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -842,8 +786,7 @@
   id: FloorShuttleWhite
   name: tiles-white-shuttle-floor
   sprite: /Textures/Tiles/shuttlewhite.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -855,8 +798,7 @@
   id: FloorShuttleBlue
   name: tiles-blue-shuttle-floor
   sprite: /Textures/Tiles/shuttleblue.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -868,8 +810,7 @@
   id: FloorShuttleOrange
   name: tiles-orange-shuttle-floor
   sprite: /Textures/Tiles/shuttleorange.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -881,8 +822,7 @@
   id: FloorShuttlePurple
   name: tiles-purple-shuttle-floor
   sprite: /Textures/Tiles/shuttlepurple.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -894,8 +834,7 @@
   id: FloorShuttleRed
   name: tiles-red-shuttle-floor
   sprite: /Textures/Tiles/shuttlered.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -909,8 +848,7 @@
   id: FloorGold
   name: tiles-gold-tile
   sprite: /Textures/Tiles/gold.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -922,8 +860,7 @@
   id: FloorSilver
   name: tiles-silver-tile
   sprite: /Textures/Tiles/silver.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -935,8 +872,7 @@
   id: FloorGlass
   name: tiles-glass-floor
   sprite: /Textures/Tiles/glass.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -948,8 +884,7 @@
   id: FloorRGlass
   name: tiles-reinforced-glass-floor
   sprite: /Textures/Tiles/rglass.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -962,8 +897,7 @@
   id: FloorGreenCircuit
   name: tiles-green-circuit-floor
   sprite: /Textures/Tiles/green_circuit.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -975,8 +909,7 @@
   id: FloorBlueCircuit
   name: tiles-blue-circuit-floor
   sprite: /Textures/Tiles/blue_circuit.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -989,8 +922,7 @@
   id: FloorGrass
   name: tiles-planet-grass-floor
   sprite: /Textures/Tiles/grass.png
-  baseTurfs:
-  - FloorDirt
+  baseTurf: FloorDirt
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1003,8 +935,7 @@
   id: FloorGrassJungle
   name: tiles-jungle-grass-floor
   sprite: /Textures/Tiles/grassjungle.png
-  baseTurfs:
-  - FloorDirt
+  baseTurf: FloorDirt
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1019,8 +950,7 @@
   sprite: /Textures/Tiles/grassdark.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - FloorDirt
+  baseTurf: FloorDirt
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1034,8 +964,7 @@
   sprite: /Textures/Tiles/grasslight.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - FloorDirt
+  baseTurf: FloorDirt
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1049,8 +978,7 @@
   sprite: /Textures/Tiles/dirt.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1063,8 +991,7 @@
   id: FloorAsteroidSand
   name: tiles-asteroid-floor
   sprite: /Textures/Tiles/Asteroid/asteroid_sand.png
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1076,8 +1003,7 @@
   id: FloorAsteroidTile
   name: tiles-asteroid-tile
   sprite: /Textures/Tiles/Asteroid/asteroid_tile.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -1091,8 +1017,7 @@
   sprite: /Textures/Tiles/Asteroid/asteroid_coarse_sand.png
   variants: 3
   placementVariants: [ 0, 1, 2 ]
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1116,8 +1041,7 @@
   id: FloorAsteroidCoarseSandDug
   name: tiles-asteroid-dug-coarse-sand
   sprite: /Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1129,8 +1053,7 @@
   id: FloorAsteroidIronsand1
   name: tiles-asteroid-ironsand
   sprite: /Textures/Tiles/ironsand1.png
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1142,8 +1065,7 @@
   id: FloorAsteroidIronsand2
   name: tiles-asteroid-ironsand-pebbles
   sprite: /Textures/Tiles/ironsand2.png
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1155,8 +1077,7 @@
   id: FloorAsteroidIronsand3
   name: tiles-asteroid-ironsand-pebbles
   sprite: /Textures/Tiles/ironsand3.png
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1168,8 +1089,7 @@
   id: FloorAsteroidIronsand4
   name: tiles-asteroid-ironsand-rock
   sprite: /Textures/Tiles/ironsand4.png
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1184,8 +1104,7 @@
   sprite: /Textures/Tiles/cave.png
   variants: 7
   placementVariants: [0, 1, 2, 3, 4, 5, 6]
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1198,8 +1117,7 @@
   sprite: /Textures/Tiles/cavedrought.png
   variants: 8
   placementVariants: [0, 1, 2, 3, 4, 5, 6, 7]
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canCrowbar: false
   footstepSounds:
@@ -1212,8 +1130,7 @@
   sprite: /Textures/Tiles/meat.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -1225,8 +1142,7 @@
   id: FloorTechMaint2
   name: tiles-techmaint2-floor
   sprite: /Textures/Tiles/steel_maint.png
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -1240,8 +1156,7 @@
   sprite: /Textures/Tiles/grating_maint.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:
@@ -1255,8 +1170,7 @@
   sprite: /Textures/Tiles/wood_tile.png
   variants: 4
   placementVariants: [0, 1, 2, 3]
-  baseTurfs:
-  - Plating
+  baseTurf: Plating
   isSubfloor: false
   canCrowbar: true
   footstepSounds:

diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml
index c40b7964ef4d144f3de5c0439d3a6a0b73c1eafa..2b18eb76492a35a687810d3bbf182574496374d4 100644 (file)
--- a/Resources/Prototypes/Tiles/planet.yml
+++ b/Resources/Prototypes/Tiles/planet.yml
@@ -52,8 +52,7 @@
     East: /Textures/Tiles/Planet/Grass/double_edge.png
     North: /Textures/Tiles/Planet/Grass/double_edge.png
     West: /Textures/Tiles/Planet/Grass/double_edge.png
-  baseTurfs:
-  - FloorPlanetDirt
+  baseTurf: FloorPlanetDirt
   isSubfloor: true
   canCrowbar: false
   footstepSounds:

diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 5ba5ec07a2226484736dbcd1e56cf6a0ea013909..26f1c56b52d14227157064705130187eb1a1ba0f 100644 (file)
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -2,8 +2,7 @@
   id: Plating
   name: tiles-plating
   sprite: /Textures/Tiles/plating.png
-  baseTurfs:
-  - Lattice
+  baseTurf: Lattice
   isSubfloor: true
   footstepSounds:
     collection: FootstepPlating
@@ -14,8 +13,7 @@
   id: Lattice
   name: tiles-lattice
   sprite: /Textures/Tiles/lattice.png
-  baseTurfs:
-  - Space
+  baseTurf: Space
   isSubfloor: true
   canWirecutter: true
   weather: true