From 1096cfd77c2ac9759606e154ba5031942af93a66 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 8 Sep 2021 16:06:36 -0700 Subject: [PATCH 1/3] Update cigs_lighters.dm --- code/game/objects/items/cigs_lighters.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 956cbb5cb3bf..4692eb7b52df 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -333,7 +333,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM list_reagents = list(/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4) /obj/item/clothing/mask/cigarette/nonico - desc = "A nicotine-free cigarette." + desc = "A Tobacco-free cigarette, it contains Chamomile, Lemon Balm, and Catnip." list_reagents = list(/datum/reagent/carbon = 15) // Rollies. @@ -931,4 +931,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/lit/Initialize() . = ..() light() // These cigarettes start lit. - \ No newline at end of file + From b700ca072b411d19cb83511c68233ccc113e385f Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 8 Sep 2021 20:44:36 -0700 Subject: [PATCH 2/3] Update code/game/objects/items/cigs_lighters.dm Co-authored-by: Byemoh --- 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 4692eb7b52df..560c50bfbc82 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -333,7 +333,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM list_reagents = list(/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4) /obj/item/clothing/mask/cigarette/nonico - desc = "A Tobacco-free cigarette, it contains Chamomile, Lemon Balm, and Catnip." + desc = "A tobacco-free cigarette, it contains chamomile, lemon balm, and catnip." list_reagents = list(/datum/reagent/carbon = 15) // Rollies. From ae52cdb135c44c2f1172808e98e913acd40512d4 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 11 Sep 2021 13:38:02 +0100 Subject: [PATCH 3/3] Update code/game/objects/items/cigs_lighters.dm --- code/game/objects/items/cigs_lighters.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 560c50bfbc82..33b95cf481bb 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -931,4 +931,3 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/lit/Initialize() . = ..() light() // These cigarettes start lit. -