NEW CARPETS!

Resources/Locale/en-US/_Floof/recipes/tags.ftl

@@ -4,3 +4,15 @@ construction-graph-tag-high-heel-boots = a pair of high heel boots
 
 #tools
 construction-graph-tag-plantclippers = plant clippers
+
+#carpets
+construction-graph-tag-carpet-simple-black = carpet simple black
+construction-graph-tag-carpet-simple-blue = carpet simple blue
+construction-graph-tag-carpet-simple-cyan = carpet simple cyan
+construction-graph-tag-carpet-simple-green = carpet simple green
+construction-graph-tag-carpet-simple-orange = carpet simple orange
+construction-graph-tag-carpet-simple-pink = carpet simple pink
+construction-graph-tag-carpet-simple-purple = carpet simple purple
+construction-graph-tag-carpet-simple-red = carpet simple red
+construction-graph-tag-carpet-simple-skyblue = carpet simple skyblue
+construction-graph-tag-carpet-simple-white = carpet simple white

Resources/Locale/en-US/_Floof/stack.ftl

@@ -1,2 +1,12 @@
 # What a waste of processing power
 stack-prize-ticket = prize ticket
+stack-carpet-simple-black-tile = carpet simple black tile
+stack-carpet-simple-blue-tile = carpet simple blue tile
+stack-carpet-simple-cyan-tile = carpet simple cyan tile
+stack-carpet-simple-green-tile = carpet simple green tile
+stack-carpet-simple-orange-tile = carpet simple orange tile
+stack-carpet-simple-pink-tile = carpet simple pink tile
+stack-carpet-simple-purple-tile = carpet simple purple tile
+stack-carpet-simple-red-tile = carpet simple red tile
+stack-carpet-simple-skyblue-tile = carpet simple skyblue tile
+stack-carpet-simple-white-tile = carpet simple white tile

Resources/Prototypes/Entities/Objects/Misc/carpets.yml

@@ -1,9 +1,9 @@
 # TODO once tiles can be smoothed and carpets ported over to that, add them to the FloorTile outputs
 - type: entity
-  name: carpet
   parent: FloorTileItemBase
   id: FloorCarpetItemRed
-  suffix: Red
+  name: red carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-red
@@ -22,7 +22,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemBlack
-  suffix: Black
+  name: black carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-black
@@ -38,7 +39,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemBlue
-  suffix: Blue
+  name: blue carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-blue
@@ -54,7 +56,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemGreen
-  suffix: Green
+  name: green carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-green
@@ -70,7 +73,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemOrange
-  suffix: Orange
+  name: orange carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-orange
@@ -86,7 +90,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemSkyBlue
-  suffix: Sky Blue
+  name: sky blue carpet # floofstation change
+  suffix: Item  # floofstation change
   components:
   - type: Sprite
     state: carpet-skyblue
@@ -102,7 +107,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemPurple
-  suffix: Purple
+  name: purple carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-purple
@@ -118,7 +124,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemPink
-  suffix: Pink
+  name: pink carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-pink
@@ -134,7 +141,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemCyan
-  suffix: Cyan
+  name: cyan carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-cyan
@@ -150,7 +158,8 @@
 - type: entity
   parent: FloorCarpetItemRed
   id: FloorCarpetItemWhite
-  suffix: White
+  name: white carpet # floofstation change
+  suffix: Item # floofstation change
   components:
   - type: Sprite
     state: carpet-white

Resources/Prototypes/Entities/Structures/Furniture/carpets.yml

@@ -49,7 +49,8 @@
 - type: entity
   id: Carpet
   parent: CarpetBase
-  suffix: Red
+  name: red carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Sprite
     sprite: Structures/Furniture/Carpets/red_carpet.rsi
@@ -78,7 +79,8 @@
 - type: entity
   id: CarpetBlack
   parent: CarpetBase
-  suffix: Black
+  name: black carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -108,7 +110,8 @@
 - type: entity
   id: CarpetPink
   parent: CarpetBase
-  suffix: Pink
+  name: pink carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -138,7 +141,8 @@
 - type: entity
   id: CarpetBlue
   parent: CarpetBase
-  suffix: Blue
+  name: blue carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -168,7 +172,8 @@
 - type: entity
   id: CarpetGreen
   parent: CarpetBase
-  suffix: Green
+  name: green carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -198,7 +203,8 @@
 - type: entity
   id: CarpetOrange
   parent: CarpetBase
-  suffix: Orange
+  name: orange carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -228,7 +234,8 @@
 - type: entity
   id: CarpetSBlue
   parent: CarpetBase
-  suffix: Sky Blue
+  name: sky blue carpet # floofstation change
+  suffix: tile Blue # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -258,7 +265,8 @@
 - type: entity
   id: CarpetPurple
   parent: CarpetBase
-  suffix: Purple
+  name: purple carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -288,7 +296,8 @@
 - type: entity
   id: CarpetCyan
   parent: CarpetBase
-  suffix: Cyan
+  name: cyan carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite
@@ -318,7 +327,8 @@
 - type: entity
   id: CarpetWhite
   parent: CarpetBase
-  suffix: White
+  name: white carpet # floofstation change
+  suffix: tile # floofstation change
   components:
   - type: Clickable
   - type: Sprite

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -640,6 +640,7 @@
     - ClothingJustice # DeltaV
     # Floofstation section
     - CollarsFloofstation
+    - CarpetSimple
     # Floofstation section end
   - type: EmagLatheRecipes
     emagStaticPacks:

Resources/Prototypes/Recipes/Lathes/carpets.yml

@@ -46,7 +46,7 @@
   parent: BaseCarpetRecipe
   id: CarpetPurple
   result: FloorCarpetItemPurple
-
+  
 - type: latheRecipe
   parent: BaseCarpetRecipe
   id: CarpetCyan

Resources/Prototypes/Stacks/Tiles/carpet.yml

@@ -61,7 +61,7 @@
   name: stack-purple-carpet-tile
   icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-purple }
   spawn: FloorCarpetItemPurple
-
+  
 - type: stack
   parent: BaseTileStack
   id: FloorCarpetPink