From e6fb8b11fc963c08e1bc283e5db0e01a9fec69a1 Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Wed, 1 Aug 2018 16:27:19 -0700 Subject: [PATCH] remove rogue pipe bug (#5022) Pipes burned shit too fast so this should fix it. --- code/game/objects/items/weapons/cigs_lighters.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index aee5459dd9b..97c8e912350 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -390,7 +390,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "pipeoff" icon_on = "pipeon" //Note - these are in masks.dmi icon_off = "pipeoff" - burn_rate = 0.003 //Lasts ~300 seconds + burn_rate = 0.003 w_class = 1 chem_volume = 30 matchmes = "USER lights their NAME with their FLAME." @@ -402,6 +402,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/pipe/Initialize() . = ..() name = "empty [initial(name)]" + burn_rate = 0 /obj/item/clothing/mask/smokable/pipe/light(var/flavor_text = "[usr] lights the [name].") if(!src.lit && burn_rate) @@ -447,11 +448,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM if (burn_rate) user << "[src] is already packed." return - burn_rate = 0.1 if(G.reagents) initial_volume = G.reagents.total_volume G.reagents.trans_to_obj(src, G.reagents.total_volume) name = "[G.name]-packed [initial(name)]" + burn_rate = initial(burn_rate) qdel(G) else if(istype(W, /obj/item/weapon/flame/lighter))