From c67490a4d4e1239d8f5f46b248ca74f56ecb6ebd Mon Sep 17 00:00:00 2001
From: Conspiir <31835830+Conspiir@users.noreply.github.com>
Date: Wed, 9 Jan 2019 14:47:35 -0600
Subject: [PATCH] What am I smoking?: Taste it! (#5890)

Now you can taste what's in your cigarette. That means if you put a dried tomato in your pipe, you're going to actually taste tomato. I've been assured that smoking things is hot, so the reagents inside will reflect that. They will be hot. Almost like you set them on fire!

This does not apply to IPCs. They should not taste anything, but still be able to smoke as they have before. I will not be the one to stop TV faces from stuffing a cigarette in their slot.

*Because of restrictions on our tasting system, some things you stuff in there will be indescribable. This just means you've decided to smoke a lot of things and nothing stands out as a flavor. For best results, make cigarettes or pipes with items that have only one or two reagents in them.

This has lowered the length of time you smoke a single cigarette by a few seconds. Not a huge deal, considering they still last like 5 minutes.
---
 .../objects/items/weapons/cigs_lighters.dm    |  3 ++
 html/changelogs/smokingtaste.yml              | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 html/changelogs/smokingtaste.yml

diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index fdba2ceff3d..0e82187f8e8 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -112,6 +112,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		var/mob/living/carbon/human/C = loc
 		if(istype(C) && src == C.wear_mask)
 			reagents.trans_to_mob(C, burn_rate*initial_volume, CHEM_BREATHE, 0.75)
+			if(C.check_has_mouth() && prob(5))
+				reagents.trans_to_mob(C, burn_rate*initial_volume, CHEM_INGEST, 0.75)
 		else
 			reagents.remove_any(burn_rate*initial_volume)
 	else
@@ -125,6 +127,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].")
 	if(!src.lit)
 		src.lit = 1
+		src.reagents.set_temperature(T0C + 45)
 		damtype = "fire"
 		if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
 			var/datum/effect/effect/system/reagents_explosion/e = new()
diff --git a/html/changelogs/smokingtaste.yml b/html/changelogs/smokingtaste.yml
new file mode 100644
index 00000000000..77a211f7fe6
--- /dev/null
+++ b/html/changelogs/smokingtaste.yml
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#################################
+
+# Your name.  
+author: Conspiir
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Taste what's in your cigarette/cigar/pipe! Oh, and it's hot because you've set it on fire and are accepting it into your body! The joys of smoking! Mmm... hot low-grade tobacco."