From a032b8d5f815ee0647f32aa6bf8414a3753a3107 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 3 Jan 2019 16:17:35 -0800 Subject: [PATCH 1/3] Update drug_reagents.dm --- .../modules/reagents/chemistry/reagents/drug_reagents.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index eb3daef393..0150e7d18d 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -167,10 +167,10 @@ /datum/reagent/drug/methamphetamine/on_mob_add(mob/living/L) ..() - L.add_trait(TRAIT_GOTTAGOREALLYFAST, id) + L.add_trait(TRAIT_IGNORESLOW, id) /datum/reagent/drug/methamphetamine/on_mob_delete(mob/living/L) - L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id) + L.remove_trait(TRAIT_IGNORESLOW, id) ..() /datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M) @@ -180,9 +180,12 @@ M.AdjustStun(-40, 0) M.AdjustKnockdown(-40, 0) M.AdjustUnconscious(-40, 0) - M.adjustStaminaLoss(-2, 0) + M.adjustStaminaLoss(-7.5, 0) M.Jitter(2) M.adjustBrainLoss(rand(1,4)) + if(prob(30)) + M.Confuse(1) + M.heal_overall_damage(2, 2) if(prob(5)) M.emote(pick("twitch", "shiver")) ..() From 2340aebe715e86db56e7b1cb47f37728c1ec8b67 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 4 Jan 2019 00:47:26 -0800 Subject: [PATCH 2/3] Update drug_reagents.dm --- code/modules/reagents/chemistry/reagents/drug_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 0150e7d18d..92c79fa72e 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -180,11 +180,11 @@ M.AdjustStun(-40, 0) M.AdjustKnockdown(-40, 0) M.AdjustUnconscious(-40, 0) - M.adjustStaminaLoss(-7.5, 0) + M.adjustStaminaLoss(-7.5 * REM, 0) M.Jitter(2) M.adjustBrainLoss(rand(1,4)) if(prob(30)) - M.Confuse(1) + M.confused = max(1, M.confused) M.heal_overall_damage(2, 2) if(prob(5)) M.emote(pick("twitch", "shiver")) From 046dc1e7dd39e02709337c3405c5108b64107a70 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 22 Feb 2019 17:07:39 -0800 Subject: [PATCH 3/3] Update drug_reagents.dm --- code/modules/reagents/chemistry/reagents/drug_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 92c79fa72e..d77756a649 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -167,10 +167,10 @@ /datum/reagent/drug/methamphetamine/on_mob_add(mob/living/L) ..() - L.add_trait(TRAIT_IGNORESLOW, id) + L.add_trait(TRAIT_IGNORESLOWDOWN, id) /datum/reagent/drug/methamphetamine/on_mob_delete(mob/living/L) - L.remove_trait(TRAIT_IGNORESLOW, id) + L.remove_trait(TRAIT_IGNORESLOWDOWN, id) ..() /datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M)