From edf74e5c05f55a0200cb513a0ebb1b5f4de92e3c Mon Sep 17 00:00:00 2001 From: ArcaneDefence Date: Wed, 26 Feb 2020 17:45:16 -0700 Subject: [PATCH 1/2] Update cigs_lighters.dm Fix for https://github.com/tgstation/tgstation/issues/49588 --- code/game/objects/items/cigs_lighters.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 1767f4e9ef5..0c6e2172f33 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -330,9 +330,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A Carp Classic brand cigarette. A small label on its side indicates that it does NOT contain carpotoxin." /obj/item/clothing/mask/cigarette/carp/Initialize() - . = ..() if(prob(5)) list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/carpotoxin = 3) //they lied + . = ..() /obj/item/clothing/mask/cigarette/syndicate desc = "An unknown brand cigarette." From 84b1dff5e03c3f69e7ce4cf6a6fa3c720a5c4767 Mon Sep 17 00:00:00 2001 From: ArcaneDefence Date: Thu, 27 Feb 2020 15:52:05 -0700 Subject: [PATCH 2/2] Update cigs_lighters.dm --- code/game/objects/items/cigs_lighters.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 0c6e2172f33..fd501938225 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -330,9 +330,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A Carp Classic brand cigarette. A small label on its side indicates that it does NOT contain carpotoxin." /obj/item/clothing/mask/cigarette/carp/Initialize() - if(prob(5)) - list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/carpotoxin = 3) //they lied - . = ..() + . = ..() + if(!prob(5)) + return + reagents?.add_reagent(/datum/reagent/toxin/carpotoxin , 3) // They lied /obj/item/clothing/mask/cigarette/syndicate desc = "An unknown brand cigarette."