cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes shock going up too much.

Browse Source
This commit is contained in:
Erthilo
2013-08-28 19:43:36 +01:00
parent 0219ffe41e
commit 74c3975ae3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1414,10 +1414,12 @@
if(analgesic) return // analgesic avoids all traumatic shock temporarily
if(health < config.health_threshold_softcrit)// health 0 makes you immediately collapse
shock_stage = max(shock_stage, 70)
shock_stage = max(shock_stage, 61)
if(traumatic_shock >= 80 || health < config.health_threshold_softcrit)
if(traumatic_shock >= 80)
shock_stage += 1
else if(health < config.health_threshold_softcrit)
shock_stage = max(shock_stage, 61)
else
shock_stage = min(shock_stage, 100)
shock_stage = max(shock_stage-1, 0)