From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Thu, 28 Nov 2024 06:49:41 +0000 (-0600)
Subject: Removes burnt tiles (#33422)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=56fd7cbb6f2d2422fb01790b89c0b50cf39e3dab;p=space-station-14.git

Removes burnt tiles (#33422)

remove burnt tiles
---

diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index c98ee6d582..0a7d2c0af6 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -884,23 +884,6 @@
   itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such, in SS13 prying destroyed tiles wouldn't give you anything.
   heatCapacity: 10000
 
-- type: tile
-  id: FloorSteelBurnt
-  name: tiles-steel-floor
-  sprite: /Textures/Tiles/steel_burnt.png
-  variants: 2
-  placementVariants:
-  - 1.0
-  - 1.0
-  baseTurf: Plating
-  isSubfloor: false
-  deconstructTools: [ Prying ]
-  footstepSounds:
-    collection: FootstepFloor
-  itemDrop: FloorTileItemSteel #Same case as FloorSteelDamaged, make it null when possible
-  heatCapacity: 10000
-
-
 # Concrete
 - type: tile
   id: FloorConcrete
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 7edb1ae784..9627ab21f2 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -25,17 +25,6 @@
   friction: 0.3
   heatCapacity: 10000
 
-- type: tile
-  id: PlatingBurnt
-  name: tiles-plating
-  sprite: /Textures/Tiles/plating_burnt.png
-  baseTurf: Lattice
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepPlating
-  friction: 0.3
-  heatCapacity: 10000
-
 - type: tile
   id: PlatingAsteroid
   name: tiles-asteroid-plating
diff --git a/Resources/Prototypes/Tiles/tile_migrations.yml b/Resources/Prototypes/Tiles/tile_migrations.yml
index 7b0b9d5d76..400e4f95a0 100644
--- a/Resources/Prototypes/Tiles/tile_migrations.yml
+++ b/Resources/Prototypes/Tiles/tile_migrations.yml
@@ -49,6 +49,8 @@
   id: FloorAsteroidCoarseSandDug
   target: FloorAsteroidSandDug
 
+# 2023-09-09
+
 - type: tileAlias
   id: FloorGlassAlt
   target: FloorGlass
@@ -56,3 +58,15 @@
 - type: tileAlias
   id: FloorRGlassAlt
   target: FloorRGlass
+
+# 2024-11-15
+# Burnt tiles now exist, but they don't use the tiles system. They're decals.
+# There's presently no way to add decals over existing tiles, so this will have to suffice for now.
+
+- type: tileAlias
+  id: PlatingBurnt
+  target: PlatingDamaged
+
+- type: tileAlias
+  id: FloorSteelBurnt
+  target: FloorSteelDamaged
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/plating_burnt.png b/Resources/Textures/Tiles/plating_burnt.png
deleted file mode 100644
index 7c89de081e..0000000000
Binary files a/Resources/Textures/Tiles/plating_burnt.png and /dev/null differ
diff --git a/Resources/Textures/Tiles/steel_burnt.png b/Resources/Textures/Tiles/steel_burnt.png
deleted file mode 100644
index 646c285916..0000000000
Binary files a/Resources/Textures/Tiles/steel_burnt.png and /dev/null differ