Skip to content

Turns space cleaner into bleach, laundry stuff#6479

Open
rye-rice wants to merge 24 commits into
shiptest-ss13:masterfrom
rye-rice:washingmahicne
Open

Turns space cleaner into bleach, laundry stuff#6479
rye-rice wants to merge 24 commits into
shiptest-ss13:masterfrom
rye-rice:washingmahicne

Conversation

@rye-rice

@rye-rice rye-rice commented Jul 9, 2026

Copy link
Copy Markdown
Member

About The Pull Request

What started as an addition for more laundry stuff alongside making laundry machines much better ended up with replacing space cleaner with bleach, which I attempted to make as fully funcitonal as possible. I'll start there since thats by far the most significant change of the PR:

Bleach
image

Recipe: one part sodium, one part oxygen, one part chlorine to get 3 parts bleach

In its most pure form, it is a quite potent corrodant. However, these downsides generally disappear as it becomes diluted. In a 1:9 Bleach: Water mixture, it cleans turfs and objects it passes over. As such, the space cleaner bottle is now a 1:9 bleach water mixture. Also cleaner foamnades dont kill you, i checked.

It bleaches hair white if it gets splashed on someone. If it's not too diluted, it will damage the person and apply a very minor acid effect. If the eyes arent covered, it will very badly burn your eyes. If ingested, it will kill you horribly, however attempts to cure any diseases while its killing you as well as reducing burn wound infections as well. A steep price to pay to remove infections/diseases, but at least its an option

In ghettochem, it can be turned back into its base parts with a capacitor


It has three reactions, all releasing chlorine in some form:

1 part bleach 1 part peroxide:

  • chemical explosion. This is about on part with water+potassium, but also sprays salt everywhere.

1 part bleach heated to 101C:

  • decomposes, putting oxygen and chlorine into the air, leaves behind sodium

1 part bleach 1 part ammonia:

  • You probably already know what this is. Do I even need to explain?

It is purchasable for 200 credits in cargo.


With all that out the way...

dreamseeker_NSQeeeUnc5

This PR not only resprites washing machines, this PR also gives them massive QOL changes and a usability makeover

Adds fabric softener and laundry detergent, alongside bleach. Barring bleach, all of these are meant to be semi-fluff/decoration; I expect a certain mapper's ship to have them in a pantry somewhere.

image

Washing machines... Might be easier to just tell you to go play a TM with it to see what was changed about it. Radial menus, washing cycles, reagents, sound effects... Overall, really good polish for an machine that's outclassed by a tiny-sized loadout item. Maybe it can be expanded on later.

Also adds the dryer, which is even more of a fluff item than washing machines.

Items cleaned by the detergent, dryer, and fabric softener give small mood buffs. This does mean they can have a use, but who the hell is going to actually going to powergame mood buffs? Most ships don't even have it anyways...

misc:

  • Resprites the linen bin (Drawn by imaginos16)

Why It's Good For The Game

I actually like having my fluff do things. Less gameplay islands are also nice.

Changelog

🆑 rye-rice, imaginos16
balance: Replaces space cleaner with bleach. Can be used for good or evil, depending on your mood.

add: Laundry machines have been given a massive makeover. Make sure to bring detergent!
add: Laundry detergent, fabric softener, and bleach have been added to cargo
add: Dryers to go with the new laundry machines
add: Resprites linen bins

/:cl:

@rye-rice
rye-rice requested review from a team as code owners July 9, 2026 08:05
@github-actions github-actions Bot added Sprites A bikeshed full of soulless bikes. Sound USSR Anthem 2.66 MB file. Code change Watch something violently break. labels Jul 9, 2026
@Slim-Pickems

Copy link
Copy Markdown
Contributor

Jugs recommend 30 units per load. Pour in 25 unit increments.
I cry.

@Slim-Pickems

Copy link
Copy Markdown
Contributor

I think the dryer and washer have a bit mixed. It mentions how you can add things to it that will be included during the wash cycle on the dryer, but not the washer.

Comment thread code/game/machinery/washing_machine.dm Outdated
update_appearance()
return

else if(user.a_intent != INTENT_HARM && density && !state_open)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

think this might have issues w/ the ones that are mapped to Not Be Dense, not a worry if you prefer it like that but atp we might as well get a wall mounted sprite for washers.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

think this might have issues w/ the ones that are mapped to Not Be Dense, not a worry if you prefer it like that but atp we might as well get a wall mounted sprite for washers.

There's also double and even single stack washer/dryer combos. Might be worth looking into..?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This was taken from dressers, which i assume the intent was that there was no need to act like a table to save space if density was FALSE, since that was already a space saving measure

Comment thread code/game/machinery/washing_machine.dm Outdated
audible_message(span_notice("[src] starts to hum as it starts washing."), span_notice("You hear a motor."))
soundloop_fill.stop()
soundloop_wash.start()
//If i could, i would make it so everything inside becomes sopping wet, but alas

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

look at make_frozen_visual & make_unfrozen. you totally could.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

i DO have an idea, but i think implementation wise it would be its whole own project

Comment thread code/game/machinery/washing_machine.dm
Comment thread code/modules/reagents/chemistry/reagents/other_reagents.dm Outdated
Comment thread code/modules/reagents/chemistry/reagents/other_reagents.dm Outdated
Comment thread code/modules/reagents/chemistry/recipes/pyrotechnics.dm Outdated
Comment thread code/modules/reagents/chemistry/recipes/pyrotechnics.dm Outdated
Comment thread code/modules/reagents/reagent_containers/spray.dm
rye-rice and others added 8 commits July 11, 2026 16:56
Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
@github-actions github-actions Bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 15, 2026
@github-actions

Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions Bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 15, 2026
@github-actions github-actions Bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 15, 2026
@github-actions

Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions Bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code change Watch something violently break. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants