From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sat, 22 Jun 2024 15:47:02 +0000 (+0200)
Subject: Prying reinforced tile now will give you back metal rod (#29084)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=325ab97a7df00440135bfe42674bbbbfa8cf9a60;p=space-station-14.git

Prying reinforced tile now will give you back metal rod (#29084)

* Reinforced tile can we welded back into metal rod

* more changes

* weh

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---

diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 3b2e4cd8f1..7de91cbb63 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -176,22 +176,6 @@
   - type: Stack
     stackType: FloorTileTechmaint
 
-- type: entity
-  name: reinforced tile
-  parent: FloorTileItemBase
-  id: FloorTileItemReinforced
-  components:
-  - type: Sprite
-    state: reinforced
-  - type: Item
-    heldPrefix: reinforced
-  - type: FloorTile
-    outputs:
-      - Plating
-      - FloorReinforced
-  - type: Stack
-    stackType: FloorTileReinforced
-
 # TODO add a catwalk tile item once tile smoothing is supported
 
 - type: entity
@@ -1133,4 +1117,4 @@
     stackType: FloorTileWoodLarge
   - type: Construction
     graph: TileWoodLarge
-    node: woodtilelarge
\ No newline at end of file
+    node: woodtilelarge
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index c88786f0dc..01bd916a67 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -58,12 +58,6 @@
   spawn: FloorTileItemGold
   maxCount: 30
 
-- type: stack
-  id: FloorTileReinforced
-  name: reinforced tile
-  spawn: FloorTileItemReinforced
-  maxCount: 30
-
 - type: stack
   id: FloorTileMono
   name: mono tile
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 52efdc7d47..602e9bc441 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -621,7 +621,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepHull
-  itemDrop: FloorTileItemReinforced
+  itemDrop: PartRodMetal1
   heatCapacity: 10000
 
 - type: tile
@@ -1839,7 +1839,7 @@
   isSubfloor: false
   footstepSounds:
     collection: FootstepHull
-  itemDrop: FloorTileItemReinforced #same case as FloorHull
+  itemDrop: PartRodMetal1 #same case as FloorHull
 
 # Faux sci tiles
 
@@ -1932,4 +1932,4 @@
   barestepSounds:
     collection: BarestepWood
   itemDrop: FloorTileItemWoodLarge
-  heatCapacity: 10000
\ No newline at end of file
+  heatCapacity: 10000
diff --git a/Resources/migration.yml b/Resources/migration.yml
index c345d8616d..6602fc1791 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -350,4 +350,7 @@ DoorRemoteFirefight: null
 AirlockServiceCaptainLocked: AirlockCaptainLocked
 
 # 2024-06-15
-ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout
\ No newline at end of file
+ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout
+
+# 2024-06-23
+FloorTileItemReinforced: PartRodMetal1