From 76513254971c1495b48034c7fca9f3e85435e787 Mon Sep 17 00:00:00 2001 From: Krausus Date: Thu, 30 Apr 2015 22:30:53 -0400 Subject: [PATCH] Reverts nicotine addiction changes --- code/game/objects/items/weapons/cigs_lighters.dm | 6 ------ code/modules/reagents/newchem/drugs.dm | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 4a62e8d99c4..d8afb760ec9 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -200,12 +200,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM C << "Your [name] no longer tastes the same..." else // else just remove some of the reagents reagents.remove_any(REAGENTS_METABOLISM) - - if(has_nicotine && iscarbon(loc) && (src == loc:wear_mask) && !smoker_is_synthetic) - // If the cigarette has nicotine, make sure the smoker is getting a bit, even if it's not in the reagents - var/mob/living/carbon/C = loc - if (!C.reagents.has_reagent("nicotine")) - C.reagents.add_reagent("nicotine", 0.1) return /obj/item/clothing/mask/cigarette/proc/die() diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm index 9515a5c9e38..b7012cb7b24 100644 --- a/code/modules/reagents/newchem/drugs.dm +++ b/code/modules/reagents/newchem/drugs.dm @@ -11,14 +11,14 @@ datum/reagent/nicotine reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 overdose_threshold = 35 - addiction_threshold = 0.1 + addiction_threshold = 30 datum/reagent/nicotine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom var/smoke_message = pick("You can just feel your lungs dying!", "You feel relaxed.", "You feel calmed.", "You feel the lung cancer forming.", "You feel the money you wasted.", "You feel like a space cowboy.", "You feel rugged.") if(prob(5)) M << "[smoke_message]" - if(volume >= 0.2 && prob(50)) // Trace amounts of nicotine are ineffective + if(prob(50)) M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1)