shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2872 from Citadel-Station-13/upstream-merge-30802

Browse Source 
[MIRROR] Stamina regen light
This commit is contained in:
LetterJay
2017-09-21 07:36:45 -04:00
committed by GitHub
parent 36cdee9f1c 0d95d65524
commit fcb907d2ce
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/debuffs.dm
+10 -1
View File
@@ -29,11 +29,20 @@
/datum/status_effect/incapacitating/knockdown /datum/status_effect/incapacitating/knockdown
id = "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 //UNCONSCIOUS
/datum/status_effect/incapacitating/unconscious /datum/status_effect/incapacitating/unconscious
id = "unconscious" id = "unconscious"
needs_update_stat = TRUE 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 //SLEEPING
/datum/status_effect/incapacitating/sleeping /datum/status_effect/incapacitating/sleeping
id = "sleeping" id = "sleeping"
@@ -57,7 +66,7 @@
/datum/status_effect/incapacitating/sleeping/tick() /datum/status_effect/incapacitating/sleeping/tick()
if(owner.staminaloss) 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) if(human_owner && human_owner.drunkenness)
human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds
if(prob(20)) if(prob(20))