cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds the ability to wash kitchenware and glassware. No actual mechanical effects. (#20922)

Browse Source 
This PR gives you the ability to wash glassware (glasses, mugs, beakers,
vials, etc) and kitchenware (pots and pans) at the sink.

With the empty item in hand, left-click a sink on DISARM intent.

There are no mechanical or gameplay changes. Items don't get dirty, you
aren't required to wash anything after use, it's just a little text-only
interaction meant for roleplay and nothing more. However, there's
nothing stopping the Executive Officer from giving you the stink-eye if
you don't wash the trays before putting them away!

---------

Signed-off-by: ASmallCuteCat <neofelisnebulosa128@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
ASmallCuteCat
2025-07-06 21:47:23 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 1759dcba86
commit cb05424e25
2 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/watercloset.dm
+15 -1
View File
@@ -311,7 +311,7 @@
icon = 'icons/obj/watercloset.dmi'
icon_state = "sink"
desc = "A sink used for washing one's hands and face."
desc_info = "Use HELP intent to fill a container in your hand from this, and use any other intent to empty the container into this. \
desc_info = "Use HELP intent to fill a container in your hand from this. Use DISARM intent to rinse an empty container. Use any other intent to empty the container into this. \
You can right-click this and change the amount transferred per use."
anchored = 1
var/busy = 0 //Something's being washed at the moment
@@ -388,6 +388,20 @@
RG.reagents.add_reagent(/singleton/reagent/water, min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this))
user.visible_message("<b>[user]</b> fills \a [RG] using \the [src].", SPAN_NOTICE("You fill \a [RG] using \the [src]."))
playsound(loc, 'sound/effects/sink.ogg', 75, 1)
return
if(user.a_intent == I_DISARM)
if(!RG.reagents.total_volume)
busy = TRUE
user.visible_message(SPAN_NOTICE("[user] starts washing \a [RG] in \the [src]."))
if(!do_after(user, 25, src))
playsound(loc, 'sound/effects/sink.ogg', 75, TRUE)
busy = FALSE
return TRUE
busy = FALSE
user.visible_message(SPAN_NOTICE("[user] finishes washing \a [RG] in \the [src]."))
else
to_chat(user, SPAN_WARNING("\The [RG] still has something in it."))
return
else
if(!RG.reagents.total_volume)
to_chat(usr, SPAN_WARNING("\The [RG] is already empty."))