From 609c75fe58e429af7e51086a7ce2ec4f756fcede Mon Sep 17 00:00:00 2001 From: Spamcat Date: Thu, 25 Oct 2012 23:37:32 +0400 Subject: [PATCH] Matches can be put in ashtrays as well. --- code/WorkInProgress/Chinsky/ashtray.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/Chinsky/ashtray.dm b/code/WorkInProgress/Chinsky/ashtray.dm index 26e5aef661d..41c78b788f0 100644 --- a/code/WorkInProgress/Chinsky/ashtray.dm +++ b/code/WorkInProgress/Chinsky/ashtray.dm @@ -17,7 +17,7 @@ /obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob) if (health < 1) return - if (istype(W,/obj/item/clothing/mask/cigarette)) + if (istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match)) if(user) if (contents.len >= max_butts) user << "This ashtray is full." @@ -28,12 +28,15 @@ user.client.screen -= W var/obj/item/clothing/mask/cigarette/cig = W if (cig.lit == 1) - src.visible_message("[user] crushes a [cig] in the [src], putting it out.") + src.visible_message("[user] crushes [cig] in [src], putting it out.") cig.put_out() else if (cig.lit == 0) - user << "You place a [cig] in [src] without even smoking it. Why would you do that?" + if(istype(cig, /obj/item/weapon/match)) + user << "You place [cig] in [src] without even lighting it. Why would you do that?" + else + user << "You place [cig] in [src] without even smoking it. Why would you do that?" else if (cig.lit == -1) - src.visible_message("[user] places a [cig] in the [src].") + src.visible_message("[user] places /the [cig] in /the [src].") user.update_inv_l_hand() user.update_inv_r_hand() add_fingerprint(user)