cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

renames GOTTAGOREALLYFAST to GOTTAGOFAST2

Browse Source
This commit is contained in:
Kyep
2018-07-26 12:44:55 -07:00
parent 1610777d6e
commit 4e3893dc00
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/combat.dm
+2 -2
View File
@@ -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
code/game/gamemodes/changeling/powers/strained_muscles.dm
+3 -3
View File
@@ -16,7 +16,7 @@
if(enabled)
to_chat(user, "<span class='notice'>Our muscles tense and strengthen.</span>")
else
user.status_flags &= ~GOTTAGOFAST
user.status_flags &= ~GOTTAGOFAST1
to_chat(user, "<span class='notice'>Our muscles relax.</span>")
if(stacks >= 10)
to_chat(user, "<span class='danger'>We collapse in exhaustion.</span>")
@@ -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, "<span class='notice'>Our muscles relax without the energy to strengthen them.</span>")
user.status_flags &= ~GOTTAGOFAST
user.status_flags &= ~GOTTAGOFAST1
user.Weaken(2)
user.emote("gasp")
break
code/game/objects/effects/mines.dm
+2 -2
View File
@@ -169,7 +169,7 @@
if(!victim.client || !istype(victim))
return
to_chat(victim, "<span class='notice'>You feel fast!</span>")
victim.status_flags |= GOTTAGOREALLYFAST
victim.status_flags |= GOTTAGOFAST1
spawn(duration)
victim.status_flags &= ~GOTTAGOREALLYFAST
victim.status_flags &= ~GOTTAGOFAST1
to_chat(victim, "<span class='notice'>You slow down.</span>")
code/modules/mob/living/carbon/human/species/species.dm
+2 -2
View File
@@ -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 .
code/modules/reagents/chemistry/reagents/drink_cold.dm
+2 -2
View File
@@ -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
code/modules/reagents/chemistry/reagents/drugs.dm
+4 -4
View File
@@ -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)
code/modules/reagents/chemistry/reagents/medicine.dm
+2 -2
View File
@@ -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)