From 6b58fb55fa979e9f81cb314a072b690fa33d310f Mon Sep 17 00:00:00 2001
From: kingofkosmos <monggi@gmail.com>
Date: Wed, 3 Jun 2015 19:03:38 +0300
Subject: [PATCH] Unnecessary isprox-check removed.

---
 code/modules/reagents/reagent_containers/glass.dm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 8dd00bd5f13..6ab4cd7fb38 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -235,9 +235,6 @@
 	flags = OPENCONTAINER
 
 /obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user as mob, params)
-	if(isprox(O))
-		user << "<span class='notice'>You add [O] to [src].</span>"
-		qdel(O)
 	if(istype(O, /obj/item/weapon/mop))
 		if(reagents.total_volume < 1)
 			user << "<span class='warning'>[src] is out of water!</span>"
@@ -247,9 +244,9 @@
 			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 	else if(isprox(O))
 		user << "<span class='notice'>You add [O] to [src].</span>"
-
-		user.put_in_hands(new /obj/item/weapon/bucket_sensor)
+		qdel(O)
 		user.unEquip(src)
 		qdel(src)
+		user.put_in_hands(new /obj/item/weapon/bucket_sensor)
 	else
 		..()