From 5ad05105f4b8fef3f0aa3b76193e726a39471d58 Mon Sep 17 00:00:00 2001 From: comma Date: Sun, 4 Mar 2012 06:45:14 +0200 Subject: [PATCH] Small bugfix to ashtrays and cig butts Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore. Also glass ashtray now shatters with sound --- code/WorkInProgress/Chinsky/ashtray.dm | 1 + code/game/objects/items/weapons/cigs_lighters.dm | 2 ++ code/modules/recycling/disposal.dm | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) 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