diff --git a/code/WorkInProgress/Chinsky/ashtray.dm b/code/WorkInProgress/Chinsky/ashtray.dm
index 9f0fee7edb5..2313ef30016 100644
--- a/code/WorkInProgress/Chinsky/ashtray.dm
+++ b/code/WorkInProgress/Chinsky/ashtray.dm
@@ -130,4 +130,5 @@
 		..()
 		name = "shards of glass"
 		desc = "Shards of glass with ash on them."
+		playsound(src, "shatter", 30, 1)
 		return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index b8bfaffeee8..12e17bac5f1 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -146,6 +146,8 @@ ZIPPO
 			processing_objects.Add(src)
 
 	put_out()
+		if (src.lit == -1)
+			return
 		src.lit = -1
 		src.damtype = "brute"
 		src.icon_state = icon_butt + "[rand(0,butt_count)]"
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 2a5989ab981..cecc6d27531 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -61,8 +61,8 @@
 			update()
 			return
 
-		if(istype(I, /obj/item/ashtray))
-			user << "\blue You empty the ashtray."
+		if(istype(I, /obj/item/ashtray) && (I.health > 0))
+			user << "\blue You empty the ashtray into [src]."
 			for(var/obj/item/O in I.contents)
 				O.loc = src
 				I.contents -= O