mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-22 04:24:20 +01:00
A few medical-related fixes.
- Fixed another problem related to the crit config - Recovering from shock won't take forever anymore - Reduced the max speed at which you suffocate, mainly to make crit slower. If this is found to affect normal suffocation too much, increase HUMAN_MAX_OXYLOSS again. - Open organs now add a lot of shock, as well. - Hitting 0 health or below will make you collapse immediately.
This commit is contained in:
@@ -2045,7 +2045,7 @@ It can still be worn/put on as normal.
|
||||
//SN src = null
|
||||
del(src)
|
||||
return
|
||||
if ((target.health >= -99.0 && target.health < 0))
|
||||
if ((target.health >= -99.0 && target.health < config.health_threshold_dead))
|
||||
target.cpr_time = world.time
|
||||
var/suff = min(target.getOxyLoss(), 7)
|
||||
target.oxyloss -= suff
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#define HUMAN_MAX_OXYLOSS 12 //Defines how much oxyloss humans can get per tick. No air applies this value.
|
||||
#define HUMAN_MAX_OXYLOSS 3 //Defines how much oxyloss humans can get per tick. No air applies this value.
|
||||
|
||||
/mob/living/carbon/human
|
||||
var
|
||||
@@ -1106,9 +1106,14 @@
|
||||
handle_shock()
|
||||
..()
|
||||
|
||||
if(health < 0)
|
||||
// health 0 makes you immediately collapse
|
||||
shock_stage = max(shock_stage, 61)
|
||||
|
||||
if(traumatic_shock >= 80)
|
||||
shock_stage += 1
|
||||
else
|
||||
if(shock_stage > 100) shock_stage = 100
|
||||
shock_stage--
|
||||
shock_stage = max(shock_stage, 0)
|
||||
return
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
var/mob/living/carbon/human/M = src
|
||||
for(var/name in M.organs)
|
||||
var/datum/organ/external/organ = M.organs[name]
|
||||
if(organ.destroyed)
|
||||
if(organ.destroyed || organ.open)
|
||||
src.traumatic_shock += 60
|
||||
else if(organ.broken)
|
||||
src.traumatic_shock += 40
|
||||
|
||||
Reference in New Issue
Block a user