From f2d6e6b78f645a8562d93b5d37f2ca2c9b80ef14 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 28 Nov 2019 20:31:30 +0100
Subject: [PATCH] Allows people to squeeze it into another container.
---
.../reagents/reagent_containers/rags.dm | 25 +++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/code/modules/reagents/reagent_containers/rags.dm b/code/modules/reagents/reagent_containers/rags.dm
index a1596a4a04..8e2f7283c2 100644
--- a/code/modules/reagents/reagent_containers/rags.dm
+++ b/code/modules/reagents/reagent_containers/rags.dm
@@ -23,7 +23,7 @@
/obj/item/reagent_containers/rag/examine(mob/user)
. = ..()
if(reagents.total_volume)
- . += "It's soaked. Alt-Click to squeeze it dry."
+ . += "It's soaked. Alt-Click to squeeze it dry, and perhaps gather the liquids into another held open container."
/obj/item/reagent_containers/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
. = ..()
@@ -85,13 +85,24 @@
/obj/item/reagent_containers/rag/AltClick(mob/user)
. = ..()
if(reagents.total_volume && user.canUseTopic(src, BE_CLOSE))
- to_chat(user, "You start squeezing the liquids out of \the [src]...")
+ to_chat(user, "You start squeezing \the [src] dry...")
if(do_after(user, action_speed, TRUE, src))
- to_chat(user, "You squeeze \the [src] dry.")
- var/atom/react_loc = get_turf(src)
- if(react_loc)
- reagents.reaction(react_loc, TOUCH)
- reagents.clear_reagents()
+ var/msg = "You squeeze \the [src]"
+ var/obj/item/target
+ if(Adjacent(user)) //Allows the user to drain the reagents into a beaker if adjacent (no telepathy).
+ for(var/obj/item/I in user.held_items)
+ if(I.is_open_container() && !I.reagents.holder_full())
+ target = I
+ break
+ if(!target)
+ msg += " dry"
+ reagents.reaction(get_turf(src), TOUCH)
+ reagents.clear_reagents()
+ else
+ msg += "'s liquids into \the [target]"
+ reagents.trans_to(target, reagents.total_volume)
+ to_chat(user, "[msg].")
+
/obj/item/reagent_containers/rag/towel
name = "towel"