Recipes for curtains and tables using carpets now respect stacks. (#33721)

* Carpet curtain/table recipes now respect stacks

* remove unused colour carpet tags

* Remove the tags outright

diff --git a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
index dca2d40aedb886905c78d297033055e926f8595f..5cc8035875a3ee80f2355f8e723ddb972ac2a3ea 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
@@ -14,9 +14,6 @@
       - Plating
   - type: Stack
     stackType: FloorCarpetRed
-  - type: Tag
-    tags:
-    - CarpetRed
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: Carpet
     doAfter: 0.5
@@ -33,9 +30,6 @@
     heldPrefix: carpet-black
   - type: Stack
     stackType: FloorCarpetBlack
-  - type: Tag
-    tags:
-    - CarpetBlack
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetBlack
     doAfter: 0.5
@@ -52,9 +46,6 @@
     heldPrefix: carpet-blue
   - type: Stack
     stackType: FloorCarpetBlue
-  - type: Tag
-    tags:
-    - CarpetBlue
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetBlue
     doAfter: 0.5
@@ -71,9 +62,6 @@
     heldPrefix: carpet-green
   - type: Stack
     stackType: FloorCarpetGreen
-  - type: Tag
-    tags:
-    - CarpetGreen
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetGreen
     doAfter: 0.5
@@ -90,9 +78,6 @@
     heldPrefix: carpet-orange
   - type: Stack
     stackType: FloorCarpetOrange
-  - type: Tag
-    tags:
-    - CarpetOrange
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetOrange
     doAfter: 0.5
@@ -109,9 +94,6 @@
     heldPrefix: carpet-skyblue
   - type: Stack
     stackType: FloorCarpetSkyBlue
-  - type: Tag
-    tags:
-    - CarpetSBlue
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetSBlue
     doAfter: 0.5
@@ -128,9 +110,6 @@
     heldPrefix: carpet-purple
   - type: Stack
     stackType: FloorCarpetPurple
-  - type: Tag
-    tags:
-    - CarpetPurple
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetPurple
     doAfter: 0.5
@@ -147,9 +126,6 @@
     heldPrefix: carpet-pink
   - type: Stack
     stackType: FloorCarpetPink
-  - type: Tag
-    tags:
-    - CarpetPink
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetPink
     doAfter: 0.5
@@ -166,9 +142,6 @@
     heldPrefix: carpet-cyan
   - type: Stack
     stackType: FloorCarpetCyan
-  - type: Tag
-    tags:
-    - CarpetCyan
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetCyan
     doAfter: 0.5
@@ -185,9 +158,6 @@
     heldPrefix: carpet-white
   - type: Stack
     stackType: FloorCarpetWhite
-  - type: Tag
-    tags:
-    - CarpetWhite
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetWhite
     doAfter: 0.5

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
index 90e77d6720fada3b1e58a354893cb1ce7286f669..21492af6a90e80da8b3cb539934145bc7de28b5b 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
@@ -17,93 +17,66 @@
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetBlack
+            - material: FloorCarpetBlack
+              amount: 1
               doAfter: 1
-              name: black carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-black
         - to: CurtainsBlue
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetBlue
+            - material: FloorCarpetBlue
+              amount: 1
               doAfter: 1
-              name: blue carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-blue
         - to: CurtainsCyan
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetCyan
+            - material: FloorCarpetCyan
+              amount: 1
               doAfter: 1
-              name: cyan carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-cyan
         - to: CurtainsGreen
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetGreen
+            - material: FloorCarpetGreen
+              amount: 1
               doAfter: 1
-              name: green carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-green
         - to: CurtainsOrange
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetOrange
+            - material: FloorCarpetOrange
+              amount: 1
               doAfter: 1
-              name: orange carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-orange
         - to: CurtainsPink
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetPink
+            - material: FloorCarpetPink
+              amount: 1
               doAfter: 1
-              name: pink carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-pink
         - to: CurtainsPurple
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetPurple
+            - material: FloorCarpetPurple
+              amount: 1
               doAfter: 1
-              name: purple carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-purple
         - to: CurtainsRed
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetRed
+            - material: FloorCarpetRed
+              amount: 1
               doAfter: 1
-              name: red carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-red
         - to: CurtainsWhite
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: CarpetWhite
+            - material: FloorCarpetWhite
+              amount: 1
               doAfter: 1
-              name: white carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-white
-              
+
     - node: Curtains
       entity: HospitalCurtains
       edges:
@@ -126,7 +99,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-    
+
     - node: CurtainsBlack
       entity: CurtainsBlack
       edges:
@@ -148,8 +121,8 @@
               amount: 1
           steps:
             - tool: Cutting
-              doAfter: 1    
-              
+              doAfter: 1
+
     - node: CurtainsBlue
       entity: CurtainsBlue
       edges:
@@ -172,7 +145,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-              
+
     - node: CurtainsCyan
       entity: CurtainsCyan
       edges:
@@ -195,7 +168,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-              
+
     - node: CurtainsGreen
       entity: CurtainsGreen
       edges:
@@ -218,7 +191,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-              
+
     - node: CurtainsOrange
       entity: CurtainsOrange
       edges:
@@ -241,7 +214,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-              
+
     - node: CurtainsPink
       entity: CurtainsPink
       edges:
@@ -264,7 +237,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-              
+
     - node: CurtainsPurple
       entity: CurtainsPurple
       edges:
@@ -287,7 +260,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-              
+
     - node: CurtainsRed
       entity: CurtainsRed
       edges:
@@ -310,7 +283,7 @@
           steps:
             - tool: Cutting
               doAfter: 1
-              
+
     - node: CurtainsWhite
       entity: CurtainsWhite
       edges:

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index d7ef51e96bf59c667a393e657fe81651daa4189f..4cee536bf92db7b6196bc8b3cf2353c45563d2bb 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -218,75 +218,48 @@
 
         - to: TableFancyBlack
           steps:
-            - tag: CarpetBlack
-              name: black carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-black
+            - material: FloorCarpetBlack
+              amount: 1
 
         - to: TableFancyBlue
           steps:
-            - tag: CarpetBlue
-              name: blue carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-blue
+            - material: FloorCarpetBlue
+              amount: 1
 
         - to: TableFancyCyan
           steps:
-            - tag: CarpetCyan
-              name: cyan carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-cyan
+            - material: FloorCarpetCyan
+              amount: 1
 
         - to: TableFancyGreen
           steps:
-            - tag: CarpetGreen
-              name: green carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-green
+            - material: FloorCarpetGreen
+              amount: 1
 
         - to: TableFancyOrange
           steps:
-            - tag: CarpetOrange
-              name: orange carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-orange
+            - material: FloorCarpetOrange
+              amount: 1
 
         - to: TableFancyPurple
           steps:
-            - tag: CarpetPurple
-              name: purple carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-purple
+            - material: FloorCarpetPurple
+              amount: 1
 
         - to: TableFancyPink
           steps:
-            - tag: CarpetPink
-              name: pink carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-pink
+            - material: FloorCarpetPink
+              amount: 1
 
         - to: TableFancyRed
           steps:
-            - tag: CarpetRed
-              name: red carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-red
+            - material: FloorCarpetRed
+              amount: 1
 
         - to: TableFancyWhite
           steps:
-            - tag: CarpetWhite
-              name: white carpet
-              icon:
-                sprite: Objects/Tiles/tile.rsi
-                state: carpet-white
+            - material: FloorCarpetWhite
+              amount: 1
 
     - node: TableCarpet
       entity: TableCarpet

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 6577b7eb89883c2c476b91442409f2e4a283a121..952ab4f909593920941b3de4b08fff6f1bb4108c 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -222,36 +222,6 @@
 - type: Tag
   id: Carpet
 
-- type: Tag
-  id: CarpetBlack
-
-- type: Tag
-  id: CarpetBlue
-
-- type: Tag
-  id: CarpetCyan
-
-- type: Tag
-  id: CarpetGreen
-
-- type: Tag
-  id: CarpetOrange
-
-- type: Tag
-  id: CarpetPink
-
-- type: Tag
-  id: CarpetPurple
-
-- type: Tag
-  id: CarpetRed
-
-- type: Tag
-  id: CarpetSBlue
-
-- type: Tag
-  id: CarpetWhite
-
 - type: Tag
   id: Carrot