From d43edd522bde6d147bb386ed0b3f76133e01130d Mon Sep 17 00:00:00 2001
From: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Date: Fri, 12 Dec 2025 20:26:51 +0100
Subject: [PATCH] Removed cocnrete doubles (#3469)

---
 Resources/Locale/ru-RU/corvax/tiles/tiles.ftl |  9 --
 Resources/Locale/ru-RU/tiles/tiles.ftl        | 18 ++--
 Resources/Prototypes/Corvax/Tiles/floors.yml  | 90 -------------------
 .../Prototypes/Tiles/tile_migrations.yml      | 40 ++++++++-
 Resources/migration.yml                       |  2 +-
 5 files changed, 49 insertions(+), 110 deletions(-)

diff --git a/Resources/Locale/ru-RU/corvax/tiles/tiles.ftl b/Resources/Locale/ru-RU/corvax/tiles/tiles.ftl
index 21c28ceaaf..9092b63159 100644
--- a/Resources/Locale/ru-RU/corvax/tiles/tiles.ftl
+++ b/Resources/Locale/ru-RU/corvax/tiles/tiles.ftl
@@ -16,12 +16,3 @@ tiles-wood-red = деревянный красный пол
 tiles-wood-large-red = большой деревянный красный пол
 tiles-wood-parquet-red = красный деревянный паркет
 tiles-wood-chess-red = красный деревянный шахматный пол
-tiles-concrete-outside = наружный бетонный пол
-tiles-concrete-outside-slab = наружная бетонная плита
-tiles-concrete-outside-smooth = наружный гладкий бетонный пол
-tiles-gray-concrete-outside = наружный серый бетонный пол
-tiles-gray-concrete-outside-slab = наружная серая бетонная плита
-tiles-gray-concrete-outside-smooth = наружный гладкий серый бетонный пол
-tiles-old-concrete-outside = наружный старый бетонный пол
-tiles-old-concrete-outside-slab = наружная старая бетонная плита
-tiles-old-concrete-outside-smooth = наружный старый гладкий бетонный пол
diff --git a/Resources/Locale/ru-RU/tiles/tiles.ftl b/Resources/Locale/ru-RU/tiles/tiles.ftl
index 1aab59fcec..7849270331 100644
--- a/Resources/Locale/ru-RU/tiles/tiles.ftl
+++ b/Resources/Locale/ru-RU/tiles/tiles.ftl
@@ -61,15 +61,15 @@ tiles-brass-floor-reebe = гладкое латунное покрытие
 tiles-mime-floor = мимский пол
 tiles-kitchen-floor = кухонный пол
 tiles-laundry-floor = пол прачечной
-tiles-concrete-tile = внутренний бетонный пол
-tiles-concrete-slab = внутренняя бетонная плита
-tiles-concrete-smooth = внутренний гладкий бетонный пол
-tiles-gray-concrete-tile = внутренний серый бетонный пол
-tiles-gray-concrete-slab = внутренняя серая бетонная плита
-tiles-gray-concrete-smooth = внутренний гладкий серый бетонный пол
-tiles-old-concrete-tile = внутренний старый бетонный пол
-tiles-old-concrete-slab = внутренняя старая бетонная плита
-tiles-old-concrete-smooth = внутренний старый гладкий бетонный пол
+tiles-concrete-tile = бетонный пол
+tiles-concrete-slab = бетонная плита
+tiles-concrete-smooth = гладкий бетонный пол
+tiles-gray-concrete-tile = серый бетонный пол
+tiles-gray-concrete-slab = серая бетонная плита
+tiles-gray-concrete-smooth = гладкий серый бетонный пол
+tiles-old-concrete-tile = старый бетонный пол
+tiles-old-concrete-slab = старая бетонная плита
+tiles-old-concrete-smooth = старый гладкий бетонный пол
 tiles-blue-arcade-floor = синий пол аркады
 tiles-red-arcade-floor = красный пол аркады
 tiles-eighties-floor = пол восьмидесятых
diff --git a/Resources/Prototypes/Corvax/Tiles/floors.yml b/Resources/Prototypes/Corvax/Tiles/floors.yml
index 9373ac0837..1b77523dac 100644
--- a/Resources/Prototypes/Corvax/Tiles/floors.yml
+++ b/Resources/Prototypes/Corvax/Tiles/floors.yml
@@ -357,93 +357,3 @@
     collection: BarestepWood
   itemDrop: FloorTileItemWoodRed
   heatCapacity: 10000
-
-- type: tile
-  id: FloorConcreteOutside
-  name: tiles-concrete-outside
-  parent: FloorConcrete
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemConcrete
-  weather: true
-
-- type: tile
-  id: FloorConcreteOutsideMono
-  name: tiles-concrete-outside-slab
-  parent: FloorConcreteMono
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemConcrete
-  weather: true
-
-- type: tile
-  id: FloorConcreteOutsideSmooth
-  name: tiles-concrete-outside-smooth
-  parent: FloorConcreteSmooth
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemConcrete
-  weather: true
-
-- type: tile
-  id: FloorGrayConcreteOutside
-  name: tiles-gray-concrete-outside
-  parent: FloorGrayConcrete
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemGrayConcrete
-  weather: true
-
-- type: tile
-  id: FloorGrayConcreteOutsideMono
-  name: tiles-gray-concrete-outside-slab
-  parent: FloorGrayConcreteMono
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemGrayConcrete
-  weather: true
-
-- type: tile
-  id: FloorGrayConcreteOutsideSmooth
-  name: tiles-gray-concrete-outside-smooth
-  parent: FloorGrayConcreteSmooth
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemGrayConcrete
-  weather: true
-
-- type: tile
-  id: FloorOldConcreteOutside
-  name: tiles-old-concrete-outside
-  parent: FloorOldConcrete
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemOldConcrete
-  weather: true
-
-- type: tile
-  id: FloorOldConcreteOutsideMono
-  name: tiles-old-concrete-outside-slab
-  parent: FloorOldConcreteMono
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemOldConcrete
-  weather: true
-
-- type: tile
-  id: FloorOldConcreteOutsideSmooth
-  name: tiles-old-concrete-outside-smooth
-  parent: FloorOldConcreteSmooth
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  itemDrop: FloorTileItemOldConcrete
-  weather: true
diff --git a/Resources/Prototypes/Tiles/tile_migrations.yml b/Resources/Prototypes/Tiles/tile_migrations.yml
index 400e4f95a0..e6e5d4f518 100644
--- a/Resources/Prototypes/Tiles/tile_migrations.yml
+++ b/Resources/Prototypes/Tiles/tile_migrations.yml
@@ -69,4 +69,42 @@
 
 - type: tileAlias
   id: FloorSteelBurnt
-  target: FloorSteelDamaged
\ No newline at end of file
+  target: FloorSteelDamaged
+
+# 2025-12-12 Corvax
+
+- type: tileAlias
+  id: FloorConcreteOutside
+  target: FloorConcrete
+
+- type: tileAlias
+  id: FloorConcreteOutsideMono
+  target: FloorConcreteMono
+
+- type: tileAlias
+  id: FloorConcreteOutsideSmooth
+  target: FloorConcreteSmooth
+
+- type: tileAlias
+  id: FloorGrayConcreteOutside
+  target: FloorGrayConcrete
+
+- type: tileAlias
+  id: FloorGrayConcreteOutsideMono
+  target: FloorGrayConcreteMono
+  
+- type: tileAlias
+  id: FloorGrayConcreteOutsideSmooth
+  target: FloorGrayConcreteSmooth
+ 
+- type: tileAlias
+  id: FloorOldConcreteOutside
+  target: FloorOldConcrete
+
+- type: tileAlias
+  id: FloorOldConcreteOutsideMono
+  target: FloorOldConcreteMono
+  
+- type: tileAlias
+  id: FloorOldConcreteOutsideSmooth
+  target: FloorOldConcreteSmooth
\ No newline at end of file
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 8fbc2a42af..7bfb1b80cc 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -765,4 +765,4 @@ ToyOwlman: ToyFigurineOwlman
 ToySkeleton: ToyFigurineSkeleton
 
 # 2025-10-28
-DrinkKiraSpecial: DrinkOrangeLimeSodaGlass
+DrinkKiraSpecial: DrinkOrangeLimeSodaGlass
\ No newline at end of file