Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

This commit is contained in:
Whitellama
2014-08-31 02:12:04 -07:00
parent e356193c02
commit f5c9586153
35 changed files with 240 additions and 232 deletions
+1 -1
View File
@@ -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/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match))
if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/flame/match))
if (contents.len >= max_butts)
user << "This ashtray is full."
return