diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 441af0673d3..3b359849315 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -2,8 +2,8 @@ ..() // Increase germ_level regularly - if(germ_level < GERM_LEVEL_AMBIENT) //if you're just standing there, you shouldn't get more germs beyond an ambient level - germ_level++ //increase by 1 per second + if(germ_level < GERM_LEVEL_AMBIENT && prob(80)) //if you're just standing there, you shouldn't get more germs beyond an ambient level + germ_level++ /mob/living/carbon/Move(NewLoc, direct) . = ..() @@ -16,7 +16,7 @@ src.bodytemperature += 2 // Moving around increases germ_level faster - if(germ_level < GERM_LEVEL_MOVE_CAP && prob(1)) + if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ /mob/living/carbon/relaymove(var/mob/user, direction) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ad2bd377db8..f5ef826bdd8 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -284,7 +284,7 @@ var/this_wound_desc = W.desc if(W.bleeding()) this_wound_desc = "bleeding [this_wound_desc]" else if(W.bandaged) this_wound_desc = "bandaged [this_wound_desc]" - if(W.germ_level > GANGREN_LEVEL_TWO) this_wound_desc = "badly infected [this_wound_desc]" + if(W.germ_level > 600) this_wound_desc = "badly infected [this_wound_desc]" else if(W.germ_level > 330) this_wound_desc = "lightly infected [this_wound_desc]" if(this_wound_desc in wound_descriptors) wound_descriptors[this_wound_desc] += W.amount diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 992bf8ed7f1..7a600b5a4d4 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -353,13 +353,14 @@ This function completely restores a damaged organ to perfect condition. if (W.germ_level > germ_level) //Badly infected wounds raise internal germ levels germ_level++ + if(germ_level > GANGREN_LEVEL_ONE && prob(round(germ_level/10))) //aiming for a light infection to become serious after 40 minutes, standing still + germ_level += 1 + if (prob(50)) + owner.adjustToxLoss(1) + if(germ_level > GANGREN_LEVEL_TWO) germ_level++ owner.adjustToxLoss(1) - - else if(germ_level > GANGREN_LEVEL_ONE && prob(round(germ_level/10))) //aiming for a light infection to become serious after 40 minutes, standing still - germ_level += 1 - owner.adjustToxLoss(1) /* diff --git a/code/setup.dm b/code/setup.dm index 9cb3645c795..016aaea9c2f 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -769,8 +769,8 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse //Germs and infection //These numbers have been calculated so that an untreated cut will become a serious infection after 50 minutes. -#define GERM_LEVEL_AMBIENT 120 //maximum germ level you can reach by standing still -#define GERM_LEVEL_MOVE_CAP 300 //maximum germ level you can reach by running around -#define GANGREN_LEVEL_ONE 50 +#define GERM_LEVEL_AMBIENT 110 //maximum germ level you can reach by standing still +#define GERM_LEVEL_MOVE_CAP 200 //maximum germ level you can reach by running around +#define GANGREN_LEVEL_ONE 100 #define GANGREN_LEVEL_TWO 1000 #define GANGREN_LEVEL_TERMINAL 2500