From 8bba88cd667d87dce69fe4a016ecd25d2001d32b Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Tue, 15 Nov 2016 18:15:32 -0600
Subject: [PATCH] Fixes a few things

---
 code/modules/recycling/disposal.dm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index e2c7397e92..854950c2fc 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -108,9 +108,13 @@
 
 	if(istype(I, /obj/item/weapon/material/ashtray))
 		var/obj/item/weapon/material/ashtray/A = I
-		user << "\blue You empty the [A.name]."
-		for(var/obj/item/O in A.contents)
-			O.loc = src
+		if(A.contents.len == 0)
+			user.visible_message("<span class='notice'>\The [user] places \the [A.name] into [src].</span>")
+			I.forceMove(src)
+		else
+			user.visible_message("<span class='notice'>\The [user] empties \the [A.name] into [src].</span>")
+			for(var/obj/item/O in A.contents)
+				O.forceMove(src)
 		A.update_icon()
 		update()
 		return