From b9b33018cd282c02d7a8cce75d56ef327bbc99be Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Mon, 14 Nov 2016 22:10:59 -0600
Subject: [PATCH] Allows emptying of ashtrays into disposals

---
 code/modules/recycling/disposal.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 13656d833a..e2c7397e92 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -106,6 +106,15 @@
 		update()
 		return
 
+	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
+		A.update_icon()
+		update()
+		return
+
 	var/obj/item/weapon/grab/G = I
 	if(istype(G))	// handle grabbed mob
 		if(ismob(G.affecting))