Skip to content

NEW CARPETS! #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ryunexo wants to merge 9 commits into
base: master
Choose a base branch
from
+1,201 −23
Open

NEW CARPETS! #299

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
91c55bb
NEW CARPETS!
Ryunexo Mar 21, 2026
b521fbf
Carpet reorganisation + new carpet
Ryunexo Mar 22, 2026
d728dab
Update stack.ftl
Ryunexo Mar 22, 2026
2a61363
formatting
Ryunexo Mar 22, 2026
74d2d76
Delete carpet-simple-purple.png
Ryunexo Mar 22, 2026
393bd0c
Added the rest of the simple coloured carpets!
Ryunexo Mar 23, 2026
5da458c
Delete carpet-purple-simple.png
Ryunexo Mar 23, 2026
c6d01bc
Update carpet.yml
Ryunexo Mar 23, 2026
d2c8a35
added markers
Ryunexo Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Resources/Locale/en-US/_Floof/recipes/tags.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions Resources/Locale/en-US/_Floof/stack.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
31 changes: 20 additions & 11 deletions Resources/Prototypes/Entities/Objects/Misc/carpets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@SyaoranFox SyaoranFox Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add floof name markers to these changes. Any file that we change that isn't in our namespace will need those.

suffix: Item
components:
- type: Sprite
state: carpet-red
Expand All @@ -22,7 +22,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemBlack
suffix: Black
name: black carpet
suffix: Item
components:
- type: Sprite
state: carpet-black
Expand All @@ -38,7 +39,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemBlue
suffix: Blue
name: blue carpet
suffix: Item
components:
- type: Sprite
state: carpet-blue
Expand All @@ -54,7 +56,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemGreen
suffix: Green
name: green carpet
suffix: Item
components:
- type: Sprite
state: carpet-green
Expand All @@ -70,7 +73,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemOrange
suffix: Orange
name: orange carpet
suffix: Item
components:
- type: Sprite
state: carpet-orange
Expand All @@ -86,7 +90,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemSkyBlue
suffix: Sky Blue
name: sky blue carpet
suffix: Item
components:
- type: Sprite
state: carpet-skyblue
Expand All @@ -102,7 +107,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemPurple
suffix: Purple
name: purple carpet
suffix: Item
components:
- type: Sprite
state: carpet-purple
Expand All @@ -118,7 +124,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemPink
suffix: Pink
name: pink carpet
suffix: Item
components:
- type: Sprite
state: carpet-pink
Expand All @@ -134,7 +141,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemCyan
suffix: Cyan
name: cyan carpet
suffix: Item
components:
- type: Sprite
state: carpet-cyan
Expand All @@ -150,7 +158,8 @@
- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemWhite
suffix: White
name: white carpet
suffix: Item
components:
- type: Sprite
state: carpet-white
Expand Down
30 changes: 20 additions & 10 deletions Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
- type: entity
id: Carpet
parent: CarpetBase
suffix: Red
name: red carpet
suffix: tile
components:
- type: Sprite
sprite: Structures/Furniture/Carpets/red_carpet.rsi
Expand Down Expand Up @@ -78,7 +79,8 @@
- type: entity
id: CarpetBlack
parent: CarpetBase
suffix: Black
name: black carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -108,7 +110,8 @@
- type: entity
id: CarpetPink
parent: CarpetBase
suffix: Pink
name: pink carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -138,7 +141,8 @@
- type: entity
id: CarpetBlue
parent: CarpetBase
suffix: Blue
name: blue carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -168,7 +172,8 @@
- type: entity
id: CarpetGreen
parent: CarpetBase
suffix: Green
name: green carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -198,7 +203,8 @@
- type: entity
id: CarpetOrange
parent: CarpetBase
suffix: Orange
name: orange carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -228,7 +234,8 @@
- type: entity
id: CarpetSBlue
parent: CarpetBase
suffix: Sky Blue
name: sky blue carpet
suffix: tile Blue
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -258,7 +265,8 @@
- type: entity
id: CarpetPurple
parent: CarpetBase
suffix: Purple
name: purple carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -288,7 +296,8 @@
- type: entity
id: CarpetCyan
parent: CarpetBase
suffix: Cyan
name: cyan carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down Expand Up @@ -318,7 +327,8 @@
- type: entity
id: CarpetWhite
parent: CarpetBase
suffix: White
name: white carpet
suffix: tile
components:
- type: Clickable
- type: Sprite
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@
- ClothingJustice # DeltaV
# Floofstation section
- CollarsFloofstation
- CarpetSimple
# Floofstation section end
- type: EmagLatheRecipes
emagStaticPacks:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Recipes/Lathes/carpets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
parent: BaseCarpetRecipe
id: CarpetPurple
result: FloorCarpetItemPurple

- type: latheRecipe
parent: BaseCarpetRecipe
id: CarpetCyan
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Stacks/Tiles/carpet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading