Skip to content

[PORT] Make anything holding water able to soak cleaning cloths #321

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
zoktiik wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −17
Open

[PORT] Make anything holding water able to soak cleaning cloths #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions code/modules/reagents/reagent_containers/glass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
17 changes: 0 additions & 17 deletions modular/Neu_Food/code/others/dairy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
..()


Expand Down
Loading