Skip to content
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

Mop and bucket interaction fix #315

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Mop and bucket interaction fix #315

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
9 changes: 8 additions & 1 deletion code/modules/reagents/reagent_containers/cups/_cup.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,18 @@
if(istype(weapon, /obj/item/mop))
if(reagents.total_volume == volume)
to_chat(user, "The [src.name] can't hold anymore liquids")
return
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN

var/obj/item/mop/attacked_mop = weapon

if(attacked_mop.reagents.total_volume < 0.1)
to_chat(user, span_warning("Your [attacked_mop.name] is already dry!"))
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN

to_chat(user, "You wring out the [attacked_mop.name] into the [src.name].")
attacked_mop.reagents.trans_to(src, attacked_mop.max_reagent_volume * 0.25)
attacked_mop.reagents.remove_all(attacked_mop.max_reagent_volume)
return SECONDARY_ATTACK_CONTINUE_CHAIN
dwasint marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot)
. = ..()
Expand Down