From dad8d161360f91c9b10a066681892cee85fbdd6c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 7 Feb 2016 20:49:28 +1030 Subject: [PATCH] Allowed pouring reagent containers down the sink. --- code/game/objects/structures/watercloset.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index f254d193f8..e218c1db92 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -345,6 +345,20 @@ anchored = 1 var/busy = 0 //Something's being washed at the moment +/obj/structure/sink/MouseDrop_T(var/obj/item/thing, var/mob/user) + ..() + if(!istype(thing) || !thing.is_open_container()) + return ..() + if(!usr.Adjacent(src)) + return ..() + if(!thing.reagents || thing.reagents.total_volume == 0) + usr << "\The [thing] is empty." + return + // Clear the vessel. + visible_message("\The [usr] tips the contents of \the [thing] into \the [src].") + thing.reagents.clear_reagents() + thing.update_icon() + /obj/structure/sink/attack_hand(mob/user as mob) if (ishuman(user)) var/mob/living/carbon/human/H = user @@ -443,7 +457,6 @@ name = "kitchen sink" icon_state = "sink_alt" - /obj/structure/sink/puddle //splishy splashy ^_^ name = "puddle" icon_state = "puddle"