cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6240

Browse Source
This commit is contained in:
mwerezak
2014-09-04 17:33:02 -04:00
parent bef305dff1
commit e01d056b75
1 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1067,22 +1067,6 @@
take_overall_damage(2,0) take_overall_damage(2,0)
traumatic_shock++ traumatic_shock++
if (drowsyness)
drowsyness--
eye_blurry = max(2, eye_blurry)
if (prob(5))
sleeping += 1
Paralyse(5)
confused = max(0, confused - 1)
// decrement dizziness counter, clamped to 0
if(resting)
dizziness = max(0, dizziness - 15)
jitteriness = max(0, jitteriness - 15)
else
dizziness = max(0, dizziness - 3)
jitteriness = max(0, jitteriness - 3)
if(!(species.flags & IS_SYNTHETIC)) handle_trace_chems() if(!(species.flags & IS_SYNTHETIC)) handle_trace_chems()
updatehealth() updatehealth()
@@ -1112,13 +1096,6 @@
if( (getOxyLoss() > 50) || (config.health_threshold_crit > health) ) if( (getOxyLoss() > 50) || (config.health_threshold_crit > health) )
Paralyse(3) Paralyse(3)
/* Done by handle_breath()
if( health <= 20 && prob(1) )
spawn(0)
emote("gasp")
if(!reagents.has_reagent("inaprovaline"))
adjustOxyLoss(1)*/
if(hallucination) if(hallucination)
if(hallucination >= 20) if(hallucination >= 20)
if(prob(3)) if(prob(3))
@@ -1161,22 +1138,17 @@
if( prob(2) && health && !hal_crit ) if( prob(2) && health && !hal_crit )
spawn(0) spawn(0)
emote("snore") emote("snore")
else if(resting)
if(halloss > 0)
adjustHalLoss(-3)
//CONSCIOUS //CONSCIOUS
else else
stat = CONSCIOUS stat = CONSCIOUS
if(halloss > 0)
adjustHalLoss(-1)
//Periodically double-check embedded_flag
if(embedded_flag && !(life_tick % 10)) if(embedded_flag && !(life_tick % 10))
var/list/E var/list/E
E = get_visible_implants(0) E = get_visible_implants(0)
if(!E.len) if(!E.len)
embedded_flag = 0 embedded_flag = 0
//Eyes //Eyes
if(!species.has_organ["eyes"]) // Presumably if a species has no eyes, they see via something else. if(!species.has_organ["eyes"]) // Presumably if a species has no eyes, they see via something else.
eye_blind = 0 eye_blind = 0
@@ -1208,9 +1180,28 @@
else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs
ear_damage = max(ear_damage-0.05, 0) ear_damage = max(ear_damage-0.05, 0)
//Resting
if(resting)
dizziness = max(0, dizziness - 15)
jitteriness = max(0, jitteriness - 15)
adjustHalLoss(-3)
else
dizziness = max(0, dizziness - 3)
jitteriness = max(0, jitteriness - 3)
adjustHalLoss(-1)
//Other //Other
handle_statuses() handle_statuses()
if (drowsyness)
drowsyness--
eye_blurry = max(2, eye_blurry)
if (prob(5))
sleeping += 1
Paralyse(5)
confused = max(0, confused - 1)
// If you're dirty, your gloves will become dirty, too. // If you're dirty, your gloves will become dirty, too.
if(gloves && germ_level > gloves.germ_level && prob(10)) if(gloves && germ_level > gloves.germ_level && prob(10))
gloves.germ_level += 1 gloves.germ_level += 1