Skip to content

NEW CARPETS!#299

Open
Ryunexo wants to merge 8 commits intoFloof-Station:masterfrom
Ryunexo:carpet-emporium
Open

NEW CARPETS!#299
Ryunexo wants to merge 8 commits intoFloof-Station:masterfrom
Ryunexo:carpet-emporium

Conversation

@Ryunexo
Copy link
Contributor

@Ryunexo Ryunexo commented Mar 21, 2026

Finally the bar and dorms can look a lot less fancy!
But essentially I just wanted some simple looking carpets because not everywhere is going to look like a dining hall.
I'm going to work on new patterns later down the line, maybe even get some extra colours if the request is high enough.

Might need a dedicated carpet printer too.. But alas, challenges for another day. In the meantime, behold my fabrics.

About the PR

Added 10 new carpets with a "simple" pattern, one for each of the already existing colours we have in game.
I've also went ahead and essentially ported Floof-Station/Floof-Station#152 so now in the unifrom lathe, carpets now have their full names.

Why / Balance

I think it looks neat and I think people would appreciate more carpet options. There will be more, eventually.

Technical details

Changes to some main files, entirely surrounding carpets and how they're labelled in the engine.
Crated some new .ymls in the _Floof directory to house the new carpets.
Added... A lot of .pngs, I think it's around eighty or so.

Media

Click to show

SimpleCarpetDisplay CarpetNamesDisplay

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Licensing:

Breaking changes

Changelog

🆑

  • add: Added 10 simple pattern carpets, one for each colour.
  • add: Carpets now have their full names in the uniform lathe.

Well, sorta.

Eventually, this will be have a ton of new carpets matching the pre-existing coloured carpets we have. Along with a few designs each.

Right now this is a proof of concept and I'm just pushing it so I can at least point at SOMETHING and say I've done it. I need to put everything into their respective folders rather than editing the default folders and files, but for now, enjoy this simple purple carpet.
@github-actions
Copy link
Contributor

github-actions bot commented Mar 21, 2026

RSI Diff Bot; head commit c6d01bc merging into 12f4509
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Floof/Objects/Tiles/tile.rsi

State Old New Status
carpet-simple-black Added
carpet-simple-blue Added
carpet-simple-cyan Added
carpet-simple-green Added
carpet-simple-orange Added
carpet-simple-pink Added
carpet-simple-purple Added
carpet-simple-red Added
carpet-simple-skyblue Added
carpet-simple-white Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_black.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_blue.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_cyan.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_green.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_orange.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_pink.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_purple.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_red.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_skyblue.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Resources/Textures/_Floof/Structures/Furniture/Carpets/carpet_simple_white.rsi

State Old New Status
carpet_0 Added
carpet_1 Added
carpet_2 Added
carpet_3 Added
carpet_4 Added
carpet_5 Added
carpet_6 Added
carpet_7 Added
full Added

Edit: diff updated after c6d01bc

@SyaoranFox SyaoranFox added the DO NOT MERGE Mrrow mrrp label Mar 21, 2026
Copy link
Collaborator

@Mnemotechnician Mnemotechnician left a comment

Choose a reason for hiding this comment

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

Everything needs to be moved under _Floof

So this was a ballache and a half.

I've added some black carpet, moved my purple carpet with them, and I've made it so that the uniform lathe actually gives the carpets their names (black carpet, blue carpet, red carpet, etc.) instead of just calling them all "carpet".

I think, if this goes smoothly. I can finally make a start on a bunch of carpets. God willing.
@github-actions github-actions bot added size/L and removed size/M labels Mar 22, 2026
Ryunexo added 6 commits March 22, 2026 22:07
God was unwilling.
u g h
Okay, this, along with tweaking the initial push to reflect the changes and we should be good to go.
son of a bollocking motherfucker
@Ryunexo Ryunexo requested a review from Mnemotechnician March 23, 2026 10:16
@SyaoranFox SyaoranFox removed the DO NOT MERGE Mrrow mrrp label Mar 23, 2026
Copy link
Contributor

@SyaoranFox SyaoranFox left a comment

Choose a reason for hiding this comment

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

Other than the markers, your PR is fine. Once those are in, i'll approve.

parent: FloorTileItemBase
id: FloorCarpetItemRed
suffix: Red
name: red carpet
Copy link
Contributor

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants