]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Removes burnt tiles (#33422)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Thu, 28 Nov 2024 06:49:41 +0000 (00:49 -0600)
committerGitHub <noreply@github.com>
Thu, 28 Nov 2024 06:49:41 +0000 (09:49 +0300)
remove burnt tiles

Resources/Prototypes/Tiles/floors.yml
Resources/Prototypes/Tiles/plating.yml
Resources/Prototypes/Tiles/tile_migrations.yml
Resources/Textures/Tiles/plating_burnt.png [deleted file]
Resources/Textures/Tiles/steel_burnt.png [deleted file]

index c98ee6d582ccc5e3ef3f4d913150e747ef034f6f..0a7d2c0af6e994dda424a80ddf84db9785b52268 100644 (file)
   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
index 7edb1ae784c9a6b336fa49c519da51156fea84d6..9627ab21f2d5a3c273f9b7ba09e58a6d88f679cc 100644 (file)
   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
index 7b0b9d5d767208eef5d0bafab18cf31c4987e3f4..400e4f95a0fd91c5bf5f238287ef808684c54f26 100644 (file)
@@ -49,6 +49,8 @@
   id: FloorAsteroidCoarseSandDug
   target: FloorAsteroidSandDug
 
+# 2023-09-09
+
 - type: tileAlias
   id: FloorGlassAlt
   target: FloorGlass
 - 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 (file)
index 7c89de0..0000000
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 (file)
index 646c285..0000000
Binary files a/Resources/Textures/Tiles/steel_burnt.png and /dev/null differ