diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index d3506d7949c..eb58efdc6bd 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -162,7 +162,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/weldermes = "USER lights NAME with FLAME"
var/ignitermes = "USER lights NAME with FLAME"
var/initial_volume = 0
- var/burn_rate = 0
+ var/burn_rate = 0 // Do not make lower than MINIMUM_CHEMICAL_VOLUME 0.01
var/last_drag = 0 //Spam limiter for audio/message when taking a drag of cigarette.
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
@@ -298,7 +298,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_off = "cigoff"
type_butt = /obj/item/trash/cigbutt
chem_volume = 30
- burn_rate = 0.006 //Lasts ~166 seconds)
+ burn_rate = 0.012 //Lasts ~83 seconds)
matchmes = "USER lights their NAME with their FLAME."
lightermes = "USER manages to light their NAME with FLAME."
zippomes = "With a flick of their wrist, USER lights their NAME with their FLAME."
@@ -356,7 +356,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/cigarette/vanilla
- burn_rate = 0.003 //300 seconds
+ burn_rate = 0.015
/obj/item/clothing/mask/smokable/cigarette/vanilla/Initialize()
. = ..()
@@ -375,7 +375,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
reagents.add_reagent(/datum/reagent/serotrotium,3)
/obj/item/clothing/mask/smokable/cigarette/blank
- burn_rate = 0.003 //300 seconds
+ burn_rate = 0.015
chem_volume = 15
/obj/item/clothing/mask/smokable/cigarette/blank/Initialize()
@@ -428,7 +428,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = "cigaroff"
type_butt = /obj/item/trash/cigbutt/cigarbutt
throw_speed = 0.5
- burn_rate = 0.003 //Lasts ~300 seconds
+ burn_rate = 0.015
chem_volume = 60
matchmes = "USER lights their NAME with their FLAME."
lightermes = "USER manages to offend their NAME by lighting it with FLAME."
@@ -536,7 +536,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
+ burn_rate = 0.015
w_class = ITEMSIZE_TINY
chem_volume = 30
matchmes = "USER lights their NAME with their FLAME."
diff --git a/html/changelogs/smoking_taste_bugfix.yml b/html/changelogs/smoking_taste_bugfix.yml
new file mode 100644
index 00000000000..810e7d296a1
--- /dev/null
+++ b/html/changelogs/smoking_taste_bugfix.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes:
+ - bugfix: "All cigarettes and pipes now generate appropriate taste messages. However, some of these will now be consumed 2-3 times faster."
\ No newline at end of file