From e2312b8be11308bde7646218f959fa2ad9e6872b Mon Sep 17 00:00:00 2001 From: Mars Date: Wed, 13 May 2020 16:03:25 +0200 Subject: [PATCH] Removes gottagofast_meth --- code/__DEFINES/combat.dm | 1 - code/modules/mob/living/carbon/human/species/_species.dm | 2 -- code/modules/reagents/chemistry/reagents/drugs.dm | 8 ++++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 956930aae70..2f98b6ee7b5 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -35,7 +35,6 @@ #define CANPUSH 8 #define PASSEMOTES 16 //Mob has a cortical borer or holders inside of it that need to see emotes. #define GOTTAGOFAST 32 -#define GOTTAGOFAST_METH 64 #define IGNORESLOWDOWN 128 #define GODMODE 4096 #define FAKEDEATH 8192 //Replaces stuff like changeling.changeling_fakedeath diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 67dd9b55312..e8a21b6a1d4 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -273,8 +273,6 @@ if(H.status_flags & GOTTAGOFAST) . -= 1 - if(H.status_flags & GOTTAGOFAST_METH) - . -= 1 return . /datum/species/proc/on_species_gain(mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment. diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 10cd5b2acce..a848330e431 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -322,13 +322,13 @@ update_flags |= M.AdjustWeakened(-2.5, FALSE) update_flags |= M.adjustStaminaLoss(-2, FALSE) update_flags |= M.SetSleeping(0, FALSE) - M.status_flags |= GOTTAGOFAST_METH + M.status_flags |= GOTTAGOFAST if(prob(50)) update_flags |= M.adjustBrainLoss(1, FALSE) return ..() | update_flags /datum/reagent/methamphetamine/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOFAST_METH + M.status_flags &= ~GOTTAGOFAST ..() /datum/reagent/methamphetamine/overdose_process(mob/living/M, severity) @@ -684,7 +684,7 @@ update_flags |= M.AdjustStunned(-2, FALSE) update_flags |= M.AdjustWeakened(-2, FALSE) update_flags |= M.adjustStaminaLoss(-2, FALSE) - M.status_flags |= GOTTAGOFAST_METH + M.status_flags |= GOTTAGOFAST M.Jitter(3) update_flags |= M.adjustBrainLoss(0.5, FALSE) if(prob(5)) @@ -692,7 +692,7 @@ return ..() | update_flags /datum/reagent/lube/ultra/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOFAST_METH + M.status_flags &= ~GOTTAGOFAST ..() /datum/reagent/lube/ultra/overdose_process(mob/living/M, severity)