From 51b8f45345fd55518a5ab6baf15a1106c2becedc Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 20 Sep 2017 20:52:37 +1200 Subject: [PATCH] Merge pull request #30802 from CPTANT/Stamina_regen_2 Stamina regen light --- code/datums/status_effects/debuffs.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 9ca564cd2d..b8e51ac860 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -29,11 +29,20 @@ /datum/status_effect/incapacitating/knockdown id = "knockdown" +/datum/status_effect/incapacitating/knockdown/tick() + if(owner.staminaloss) + owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds + + //UNCONSCIOUS /datum/status_effect/incapacitating/unconscious id = "unconscious" needs_update_stat = TRUE +/datum/status_effect/incapacitating/unconscious/tick() + if(owner.staminaloss) + owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds + //SLEEPING /datum/status_effect/incapacitating/sleeping id = "sleeping" @@ -57,7 +66,7 @@ /datum/status_effect/incapacitating/sleeping/tick() if(owner.staminaloss) - owner.adjustStaminaLoss(-0.35) //reduce stamina loss by 0.35 per tick, 7 per 2 seconds + owner.adjustStaminaLoss(-0.5) //reduce stamina loss by 0.5 per tick, 10 per 2 seconds if(human_owner && human_owner.drunkenness) human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds if(prob(20))