Merge pull request #614 from comma/master

Some derpfixes
2026-08-23 03:57:13 +01:00 · 2012-03-03 22:26:54 -08:00
parent 8ae3d23684 5ad05105f4
commit 1575df93ce
3 changed files with 5 additions and 2 deletions
@@ -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