From 6d30b44ac659fe94e787f4c9a38a3214c6532996 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Fri, 19 Feb 2016 21:20:04 -0800 Subject: [PATCH] You can now light cigarettes off of burning mobs --- code/game/objects/items/weapons/cigs.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index b357075b62d..e1c441eea90 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -49,6 +49,16 @@ LIGHTERS ARE IN LIGHTERS.DM qdel(reagents) return ..() +/obj/item/clothing/mask/cigarette/attack(var/mob/living/M, var/mob/living/user, def_zone) + if(istype(M) && M.on_fire) + user.changeNext_move(CLICK_CD_MELEE) + 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/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if(istype(W, /obj/item/weapon/weldingtool))