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

Transient status effects now have a default upper bound of 5 minutes (#24847)

Browse Source 
* Transient status effects now have an upper bound of 5 minutes

* sure why not
This commit is contained in:
GDN
2024-04-06 18:47:20 -05:00
committed by GitHub
parent db699400f4
commit 04d87bc0d0
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_status_procs.dm
+21 -21
View File
@@ -196,9 +196,9 @@ STATUS EFFECTS
* Arguments:
* * amount - Amount to add. Can be negative to reduce duration.
* * bound_lower - Minimum bound to set at least to. Defaults to 0.
* * bound_upper - Maximum bound to set up to. Defaults to infinity.
* * bound_upper - Maximum bound to set up to. Defaults to 5 minutes.
*/
/mob/living/proc/AdjustConfused(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustConfused(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetConfused(directional_bounded_sum(get_confusion(), amount, bound_lower, bound_upper))
// DIZZY
@@ -227,9 +227,9 @@ STATUS EFFECTS
* Arguments:
* * amount - Amount to add. Can be negative to reduce duration.
* * bound_lower - Minimum bound to set at least to. Defaults to 0.
* * bound_upper - Maximum bound to set up to. Defaults to infinity.
* * bound_upper - Maximum bound to set up to. Defaults to 5 minutes.
*/
/mob/living/proc/AdjustDizzy(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustDizzy(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetDizzy(directional_bounded_sum(get_dizziness(), amount, bound_lower, bound_upper))
// DROWSY
@@ -258,9 +258,9 @@ STATUS EFFECTS
* Arguments:
* * amount - Amount to add. Can be negative to reduce duration.
* * bound_lower - Minimum bound to set at least to. Defaults to 0.
* * bound_upper - Maximum bound to set up to. Defaults to infinity.
* * bound_upper - Maximum bound to set up to. Defaults to 5 minutes.
*/
/mob/living/proc/AdjustDrowsy(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustDrowsy(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetDrowsy(directional_bounded_sum(get_drowsiness(), amount, bound_lower, bound_upper))
// DRUNK
@@ -289,9 +289,9 @@ STATUS EFFECTS
* Arguments:
* * amount - Amount to add. Can be negative to reduce duration.
* * bound_lower - Minimum bound to set at least to. Defaults to 0.
* * bound_upper - Maximum bound to set up to. Defaults to infinity.
* * bound_upper - Maximum bound to set up to. Defaults to 5 minutes.
*/
/mob/living/proc/AdjustDrunk(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustDrunk(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetDrunk(directional_bounded_sum(get_drunkenness(), amount, bound_lower, bound_upper))
// DRUGGY
@@ -305,7 +305,7 @@ STATUS EFFECTS
/mob/living/proc/SetDruggy(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_DRUGGED, amount)
/mob/living/proc/AdjustDruggy(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustDruggy(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetDruggy(directional_bounded_sum(AmountDruggy(), amount, bound_lower, bound_upper))
// EYE_BLIND
@@ -318,7 +318,7 @@ STATUS EFFECTS
/mob/living/proc/SetEyeBlind(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_BLINDED, amount)
/mob/living/proc/AdjustEyeBlind(amount, bound_lower = 0, bound_upper = INFINITY, updating = TRUE)
/mob/living/proc/AdjustEyeBlind(amount, bound_lower = 0, bound_upper = 5 MINUTES, updating = TRUE)
SetEyeBlind(directional_bounded_sum(AmountBlinded(), amount, bound_lower, bound_upper))
// EYE_BLURRY
@@ -331,7 +331,7 @@ STATUS EFFECTS
/mob/living/proc/SetEyeBlurry(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_BLURRY_EYES, amount)
/mob/living/proc/AdjustEyeBlurry(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustEyeBlurry(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetEyeBlurry(directional_bounded_sum(AmountEyeBlurry(), amount, bound_lower, bound_upper))
// HALLUCINATION
@@ -344,7 +344,7 @@ STATUS EFFECTS
/mob/living/proc/SetHallucinate(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_HALLUCINATION, amount)
/mob/living/proc/AdjustHallucinate(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustHallucinate(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetHallucinate(directional_bounded_sum(AmountHallucinate(), amount, bound_lower, bound_upper))
// JITTER
@@ -360,7 +360,7 @@ STATUS EFFECTS
return
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_JITTER, amount)
/mob/living/proc/AdjustJitter(amount, bound_lower = 0, bound_upper = INFINITY, force = 0)
/mob/living/proc/AdjustJitter(amount, bound_lower = 0, bound_upper = 5 MINUTES, force = 0)
SetJitter(directional_bounded_sum(AmountJitter(), amount, bound_lower, bound_upper), force)
// LOSE_BREATH
@@ -376,7 +376,7 @@ STATUS EFFECTS
return
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_LOSE_BREATH, amount)
/mob/living/proc/AdjustLoseBreath(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustLoseBreath(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetLoseBreath(directional_bounded_sum(AmountLoseBreath(), amount, bound_lower, bound_upper))
// PARALYSE
@@ -409,7 +409,7 @@ STATUS EFFECTS
P = apply_status_effect(STATUS_EFFECT_PARALYZED, amount)
return P
/mob/living/proc/AdjustParalysis(amount, bound_lower = 0, bound_upper = INFINITY, ignore_canstun = FALSE)
/mob/living/proc/AdjustParalysis(amount, bound_lower = 0, bound_upper = 5 MINUTES, ignore_canstun = FALSE)
return SetParalysis(directional_bounded_sum(AmountParalyzed(), amount, bound_lower, bound_upper), ignore_canstun)
// SILENT
@@ -440,7 +440,7 @@ STATUS EFFECTS
/mob/living/proc/SetPreventOxyHeal(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_NO_OXY_HEAL, amount)
/mob/living/proc/AdjustSilence(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustSilence(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetSilence(directional_bounded_sum(AmountSilenced(), amount, bound_lower, bound_upper))
//DEAFNESS
@@ -453,7 +453,7 @@ STATUS EFFECTS
/mob/living/proc/SetDeaf(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_DEAF, amount)
/mob/living/proc/AdjustDeaf(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustDeaf(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetDeaf(directional_bounded_sum(AmountDeaf(), amount, bound_lower, bound_upper))
// SLEEPING
@@ -506,7 +506,7 @@ STATUS EFFECTS
S = apply_status_effect(STATUS_EFFECT_SLEEPING, -1)
return S
/mob/living/proc/AdjustSleeping(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustSleeping(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetSleeping(directional_bounded_sum(AmountSleeping(), amount, bound_lower, bound_upper))
// SLOWED
@@ -556,7 +556,7 @@ STATUS EFFECTS
/mob/living/proc/SetSlur(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_SLURRING, amount)
/mob/living/proc/AdjustSlur(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustSlur(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetSlur(directional_bounded_sum(AmountSluring(), amount, bound_lower, bound_upper))
// CULTSLURRING
@@ -569,7 +569,7 @@ STATUS EFFECTS
/mob/living/proc/SetCultSlur(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_CULT_SLUR, amount)
/mob/living/proc/AdjustCultSlur(amount, bound_lower = 0, bound_upper = INFINITY)
/mob/living/proc/AdjustCultSlur(amount, bound_lower = 0, bound_upper = 5 MINUTES)
SetCultSlur(directional_bounded_sum(AmountCultSlurring(), amount, bound_lower, bound_upper))
/* STUN */
@@ -678,7 +678,7 @@ STATUS EFFECTS
return
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_STAMMER, amount)
/mob/living/proc/AdjustStuttering(amount, bound_lower = 0, bound_upper = INFINITY, ignore_canstun = FALSE)
/mob/living/proc/AdjustStuttering(amount, bound_lower = 0, bound_upper = 5 MINUTES, ignore_canstun = FALSE)
SetStuttering(directional_bounded_sum(AmountStuttering(), amount, bound_lower, bound_upper), ignore_canstun)
// WEAKEN