From 04081f8fff9302140f505626b72c903068d4466d Mon Sep 17 00:00:00 2001 From: zoktiik <50035052+zoktiik@users.noreply.github.com> Date: Tue, 17 Feb 2026 06:13:13 -0800 Subject: [PATCH] Make anything holding water able to soak cleaning cloths --- .../reagents/reagent_containers/glass.dm | 17 +++++++++++++++++ modular/Neu_Food/code/others/dairy.dm | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 103682f9495..0ecd1787a55 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -194,6 +194,23 @@ onfill(E, user, silent = FALSE) qdel(E) return + + if(istype(I, /obj/item/natural/cloth)) + var/obj/item/natural/cloth/T = I + if(T.wet >= 10) + to_chat(user, span_warning("[T] is already soaked!")) + return + var/removereg = /datum/reagent/water + if(!reagents.has_reagent(/datum/reagent/water, 5)) + removereg = /datum/reagent/water/gross + if(!reagents.has_reagent(/datum/reagent/water/gross, 5)) + to_chat(user, span_warning("There's not enough water to soak [T] in.")) + return + wash_atom(T) + playsound(src, pick('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg'), 100, FALSE) + reagents.remove_reagent(removereg, 5) + user.visible_message(span_info("[user] soaks [T] in [src]."), span_info("I soak [T] in [src].")) + return ..() // Called whenever this container is successfully filled via the target. diff --git a/modular/Neu_Food/code/others/dairy.dm b/modular/Neu_Food/code/others/dairy.dm index 1cda7aad2cd..1a56aec8923 100644 --- a/modular/Neu_Food/code/others/dairy.dm +++ b/modular/Neu_Food/code/others/dairy.dm @@ -126,23 +126,6 @@ reagents.remove_reagent(/datum/reagent/consumable/milk/salted, 5) new /obj/item/reagent_containers/food/snacks/rogue/cheese(drop_location()) return - - var/obj/item/natural/cloth/T = I - if(T.wet >= 10) - to_chat(user, span_warning("[T] is already soaked!")) //So we dont waste water if its already at max wetness or higher - return - else - var/removereg = /datum/reagent/water - if(!reagents.has_reagent(/datum/reagent/water, 5)) - removereg = /datum/reagent/water/gross - if(!reagents.has_reagent(/datum/reagent/water/gross, 5)) - to_chat(user, span_warning("No water to soak in.")) - return - wash_atom(T) - playsound(src, pick('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg'), 100, FALSE) - reagents.remove_reagent(removereg, 5) - user.visible_message(span_info("[user] soaks [T] in [src].")) - return ..()