diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 686bc3e1759..593419b61b1 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -34,7 +34,7 @@ #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 GOTTAGOREALLYFAST 64 +#define GOTTAGOFAST_METH 64 #define IGNORESLOWDOWN 128 #define GODMODE 4096 #define FAKEDEATH 8192 //Replaces stuff like changeling.changeling_fakedeath diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 4c4cd42682b..2ca9182c912 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -172,7 +172,7 @@ if(!victim.client || !istype(victim)) return to_chat(victim, "You feel fast!") - victim.status_flags |= GOTTAGOREALLYFAST + victim.status_flags |= GOTTAGOFAST spawn(duration) - victim.status_flags &= ~GOTTAGOREALLYFAST + victim.status_flags &= ~GOTTAGOFAST to_chat(victim, "You slow down.") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index c11d84451f9..cb1d9b55319 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -253,8 +253,8 @@ if(H.status_flags & GOTTAGOFAST) . -= 1 - if(H.status_flags & GOTTAGOREALLYFAST) - . -= 2 + 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 a2bd35ae75a..77c4b08f359 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -302,13 +302,13 @@ M.AdjustWeakened(-2.5) M.adjustStaminaLoss(-2) M.SetSleeping(0) - M.status_flags |= GOTTAGOREALLYFAST + M.status_flags |= GOTTAGOFAST_METH if(prob(50)) M.adjustBrainLoss(1.0) ..() /datum/reagent/methamphetamine/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOREALLYFAST + M.status_flags &= ~GOTTAGOFAST_METH ..() /datum/reagent/methamphetamine/overdose_process(mob/living/M, severity) @@ -590,7 +590,7 @@ M.AdjustStunned(-2) M.AdjustWeakened(-2) M.adjustStaminaLoss(-2) - M.status_flags |= GOTTAGOREALLYFAST + M.status_flags |= GOTTAGOFAST_METH M.Jitter(3) M.adjustBrainLoss(0.5) if(prob(5)) @@ -598,7 +598,7 @@ ..() /datum/reagent/lube/ultra/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOREALLYFAST + M.status_flags &= ~GOTTAGOFAST_METH ..() /datum/reagent/lube/ultra/overdose_process(mob/living/M, severity)