From 6e261771dbfeca2313972f3732401f4d1547221e Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Fri, 19 Feb 2016 21:20:04 -0800 Subject: [PATCH 1/2] Allows lighting of smokeables on burning people --- code/game/objects/items/weapons/cigs_lighters.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 0578c9ab6a6..6e658c52d78 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -195,6 +195,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM text = replacetext(text, "FLAME", "[W.name]") light(text) +/obj/item/clothing/mask/smokable/attack(var/mob/living/M, var/mob/living/user, def_zone) + if(istype(M) && M.on_fire) + user.do_attack_animation(M) + light("[user] coldly lights the [name] with the burning body of [M]. Clearly, they offer the warmest of regards...") + return 1 + else + return ..() + /obj/item/clothing/mask/smokable/cigarette name = "cigarette" desc = "A roll of tobacco and nicotine." From 23c3c58f25fcbffce51ce53f6d53747f5e501002 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 20 Feb 2016 21:31:13 +0000 Subject: [PATCH 2/2] Removes inappropriate message --- code/game/objects/items/weapons/cigs_lighters.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 6e658c52d78..b156d569ad6 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -198,7 +198,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/attack(var/mob/living/M, var/mob/living/user, def_zone) if(istype(M) && M.on_fire) user.do_attack_animation(M) - light("[user] coldly lights the [name] with the burning body of [M]. Clearly, they offer the warmest of regards...") + light("[user] coldly lights the [name] with the burning body of [M].") return 1 else return ..()