diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 0f576de6c04..26e6c71f51b 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -326,11 +326,11 @@ if(antibiotics >= 5) germ_level = 0 //just finish up this small infection else - germ_level -= antibiotics * 5 //Clears very quickly, finishing up remnants of infection + germ_level = max(germ_level - (antibiotics * 5), 0) //Clears very quickly, finishing up remnants of infection else if(germ_level <= INFECTION_LEVEL_TWO) - germ_level -= min(antibiotics, 6) //Still quick, infection's not too bad. At max dose and germ_level 500, should take a minute or two + germ_level = max(germ_level - min(antibiotics, 6), 0) //Still quick, infection's not too bad. At max dose and germ_level 500, should take a minute or two else - germ_level -= min(antibiotics * 0.5, 3) //Big infections, very slow to stop. At max dose and germ_level 1000, should take five to six minutes + germ_level = max(germ_level - min(antibiotics * 0.5, 3), 0) //Big infections, very slow to stop. At max dose and germ_level 1000, should take five to six minutes //Adds autopsy data for used_weapon. /obj/item/organ/proc/add_autopsy_data(var/used_weapon, var/damage) diff --git a/html/changelogs/doxxmedearly - negative_infections.yml b/html/changelogs/doxxmedearly - negative_infections.yml new file mode 100644 index 00000000000..1c6d09ae84a --- /dev/null +++ b/html/changelogs/doxxmedearly - negative_infections.yml @@ -0,0 +1,6 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - bugfix: "Fixed an issue with the germ counter going into negative values on limbs, which caused odd behavior such as reoccurring infections."