From 7d522fe449d456bd998145b4d9b31f9e196b431f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 10 Mar 2020 00:40:11 -0700 Subject: [PATCH 1/2] Fixed menthol cigarette runtime --- .../Chemistry-Reagents-Medicine.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 9e6441157f1..c3c1f2a052b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1378,3 +1378,17 @@ M.adjustOxyLoss(-4 * removed) M.adjustToxLoss(-2 * removed) M.adjustCloneLoss(-2 * removed) +<<<<<<< HEAD +======= + +/datum/reagent/menthol + name = "Menthol" + id = "menthol" + description = "Tastes naturally minty, and imparts a very mild numbing sensation." + taste_description = "mint" + reagent_state = LIQUID + color = "#80af9c" + metabolism = REM * 0.002 + overdose = REAGENTS_OVERDOSE * 0.25 + scannable = 1 +>>>>>>> aee62cf... Merge pull request #6797 from Cerebulon/mentholfix From 53b19470ce589873af05231ed78801a02ee943eb Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Tue, 10 Mar 2020 10:02:10 -0400 Subject: [PATCH 2/2] Update Chemistry-Reagents-Medicine.dm --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index c3c1f2a052b..68085f5a99c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1378,8 +1378,6 @@ M.adjustOxyLoss(-4 * removed) M.adjustToxLoss(-2 * removed) M.adjustCloneLoss(-2 * removed) -<<<<<<< HEAD -======= /datum/reagent/menthol name = "Menthol" @@ -1391,4 +1389,3 @@ metabolism = REM * 0.002 overdose = REAGENTS_OVERDOSE * 0.25 scannable = 1 ->>>>>>> aee62cf... Merge pull request #6797 from Cerebulon/mentholfix