cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-15 09:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3244 from VOREStation/aro-infectheal

Browse Source 
Prevent infections from healing you, small tweaks
This commit is contained in:
Aronai Sieyes
2018-03-16 19:54:38 -04:00
committed by GitHub
parent 6bb551c49a c43da73796
commit 29ae148dcf
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ.dm
+18 -6
View File
@@ -142,6 +142,7 @@ var/list/organ_cache = list()
if(status & ORGAN_DEAD)
user << "<span class='notice'>The decay has set in.</span>"
//A little wonky: internal organs stop calling this (they return early in process) when dead, but external ones cause further damage when dead
/obj/item/organ/proc/handle_germ_effects()
//** Handle the effects of infections
if(robotic >= ORGAN_ROBOT) //Just in case!
@@ -152,11 +153,14 @@ var/list/organ_cache = list()
var/infection_damage = 0
if((status & ORGAN_DEAD) && antibiotics < ANTIBIO_OD) //Sepsis from 'dead' organs
infection_damage = min(1, 1 + round((germ_level - INFECTION_LEVEL_THREE)/200,0.25)) //1 Tox plus a little based on germ level
/// Infection damage
//If the organ is dead, for the sake of organs that may have died due to non-infection, we'll only do damage if they have at least L1 infection (built up below)
if((status & ORGAN_DEAD) && antibiotics < ANTIBIO_OD && germ_level >= INFECTION_LEVEL_ONE)
infection_damage = max(1, 1 + round((germ_level - INFECTION_LEVEL_THREE)/200,0.25)) //1 Tox plus a little based on germ level
else if(germ_level > INFECTION_LEVEL_TWO && antibiotics < ANTIBIO_OD)
infection_damage = min(0.25, 0.25 + round((germ_level - INFECTION_LEVEL_TWO)/200,0.25))
infection_damage = max(0.25, 0.25 + round((germ_level - INFECTION_LEVEL_TWO)/200,0.25))
if(infection_damage)
owner.adjustToxLoss(infection_damage)
@@ -164,23 +168,31 @@ var/list/organ_cache = list()
if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE/2 && prob(30))
adjust_germ_level(-antibiotics)
/// Germ Accumulation
//Dead organs accumulate germs indefinitely
if(status & ORGAN_DEAD)
adjust_germ_level(1)
//Half of level 1 is growing but harmless
if (germ_level >= INFECTION_LEVEL_ONE/2)
//aiming for germ level to go from ambient to INFECTION_LEVEL_TWO in an average of 15 minutes
if(!antibiotics && prob(round(germ_level/6)))
adjust_germ_level(1)
//Level 1 qualifies for specific organ processing effects
if(germ_level >= INFECTION_LEVEL_ONE)
. = 1 //Organ qualifies for effect-specific processing
//var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 5)* min(germ_level/INFECTION_LEVEL_TWO, 1) + owner.species.body_temperature
//owner.bodytemperature += between(0, (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1, fever_temperature - owner.bodytemperature)
. = 1
var/fever_temperature = owner.species.heat_discomfort_level * 1.10 //Heat discomfort level plus 10%
if(owner.bodytemperature < fever_temperature)
owner.bodytemperature += min(0.2,(fever_temperature - owner.bodytemperature) / 10) //Will usually climb by 0.2, else 10% of the difference if less
//Level two qualifies for further processing effects
if (germ_level >= INFECTION_LEVEL_TWO)
. = 2 //Organ qualifies for effect-specific processing
//No particular effect on the general 'organ' at 3
//Level three qualifies for significant growth and further effects
if (germ_level >= INFECTION_LEVEL_THREE && antibiotics < ANTIBIO_OD)
. = 3 //Organ qualifies for effect-specific processing
adjust_germ_level(rand(5,10)) //Germ_level increases without overdose of antibiotics