From 4e3893dc000082d02856b8a00dc30fd3283ddb76 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 26 Jul 2018 12:44:55 -0700 Subject: [PATCH] renames GOTTAGOREALLYFAST to GOTTAGOFAST2 --- code/__DEFINES/combat.dm | 4 ++-- code/game/gamemodes/changeling/powers/strained_muscles.dm | 6 +++--- code/game/objects/effects/mines.dm | 4 ++-- code/modules/mob/living/carbon/human/species/species.dm | 4 ++-- code/modules/reagents/chemistry/reagents/drink_cold.dm | 4 ++-- code/modules/reagents/chemistry/reagents/drugs.dm | 8 ++++---- code/modules/reagents/chemistry/reagents/medicine.dm | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index c244dc0c7a7..517d23930b5 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -34,8 +34,8 @@ #define CANPUSH 8 #define LEAPING 16 #define PASSEMOTES 32 //Mob has a cortical borer or holders inside of it that need to see emotes. -#define GOTTAGOFAST 64 -#define GOTTAGOREALLYFAST 128 +#define GOTTAGOFAST1 64 +#define GOTTAGOFAST2 128 #define IGNORESLOWDOWN 256 #define GODMODE 4096 #define FAKEDEATH 8192 //Replaces stuff like changeling.changeling_fakedeath diff --git a/code/game/gamemodes/changeling/powers/strained_muscles.dm b/code/game/gamemodes/changeling/powers/strained_muscles.dm index 28884c2653a..fce277974de 100644 --- a/code/game/gamemodes/changeling/powers/strained_muscles.dm +++ b/code/game/gamemodes/changeling/powers/strained_muscles.dm @@ -16,7 +16,7 @@ if(enabled) to_chat(user, "Our muscles tense and strengthen.") else - user.status_flags &= ~GOTTAGOFAST + user.status_flags &= ~GOTTAGOFAST1 to_chat(user, "Our muscles relax.") if(stacks >= 10) to_chat(user, "We collapse in exhaustion.") @@ -24,11 +24,11 @@ user.emote("gasp") while(enabled) - user.status_flags |= GOTTAGOFAST + user.status_flags |= GOTTAGOFAST1 if(user.stat || user.staminaloss >= 90) enabled = 0 //Let's use something exact instead of !enabled where we can. to_chat(user, "Our muscles relax without the energy to strengthen them.") - user.status_flags &= ~GOTTAGOFAST + user.status_flags &= ~GOTTAGOFAST1 user.Weaken(2) user.emote("gasp") break diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 18506a5c882..aca8eed8832 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -169,7 +169,7 @@ if(!victim.client || !istype(victim)) return to_chat(victim, "You feel fast!") - victim.status_flags |= GOTTAGOREALLYFAST + victim.status_flags |= GOTTAGOFAST1 spawn(duration) - victim.status_flags &= ~GOTTAGOREALLYFAST + victim.status_flags &= ~GOTTAGOFAST1 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 c26e088a763..ed554609e20 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -253,9 +253,9 @@ if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR - if(H.status_flags & GOTTAGOFAST) + if(H.status_flags & GOTTAGOFAST1) . -= 1 - if(H.status_flags & GOTTAGOREALLYFAST) + if(H.status_flags & GOTTAGOFAST2) . -= 1 return . diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index a92d8644c6b..97e621ad4c9 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -69,11 +69,11 @@ M.Druggy(30) M.AdjustDizzy(5) M.SetDrowsy(0) - M.status_flags |= GOTTAGOFAST + M.status_flags |= GOTTAGOFAST1 ..() /datum/reagent/consumable/drink/cold/nuka_cola/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOFAST + M.status_flags &= ~GOTTAGOFAST1 ..() /datum/reagent/consumable/drink/cold/spacemountainwind diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index a2bd35ae75a..f701220314e 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 |= GOTTAGOFAST2 if(prob(50)) M.adjustBrainLoss(1.0) ..() /datum/reagent/methamphetamine/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOREALLYFAST + M.status_flags &= ~GOTTAGOFAST2 ..() /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 |= GOTTAGOFAST2 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 &= ~GOTTAGOFAST2 ..() /datum/reagent/lube/ultra/overdose_process(mob/living/M, severity) diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index f603d5eb0d1..5dc4650fac0 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -772,7 +772,7 @@ can_synth = FALSE /datum/reagent/medicine/stimulative_agent/on_mob_life(mob/living/M) - M.status_flags |= GOTTAGOFAST + M.status_flags |= GOTTAGOFAST1 if(M.health < 50 && M.health > 0) M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER) M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER) @@ -785,7 +785,7 @@ ..() /datum/reagent/medicine/stimulative_agent/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOFAST + M.status_flags &= ~GOTTAGOFAST1 ..() /datum/reagent/medicine/stimulative_agent/overdose_process(mob/living/M, severity)