diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 46f6be8f2b8..fb52683bb79 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -20,8 +20,9 @@ //Germs /datum/organ/proc/get_cure_threshold() //before reaching level three, the amount of spaceacillin required to cure infections scales between 5 and 30 units - var/germ_scale = max((germ_level - INFECTION_LEVEL_ONE)/(INFECTION_LEVEL_THREE - INFECTION_LEVEL_ONE), 0) - return min(5 + germ_scale*25, 30) + //var/germ_scale = max((germ_level - INFECTION_LEVEL_ONE)/(INFECTION_LEVEL_THREE - INFECTION_LEVEL_ONE), 0) + //return min(5 + germ_scale*25, 30) + return 5 //Based on Hubble's suggestion /datum/organ/proc/handle_antibiotics() var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index af85b328cf3..44531006a6e 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -401,7 +401,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (prob(3)) //adjust this to tweak how fast people take toxin damage from infections owner.adjustToxLoss(1) - if(germ_level >= INFECTION_LEVEL_TWO && antibiotics < cure_threshold - 5) //should start at around 8 units of spaceacillin + if(germ_level >= INFECTION_LEVEL_TWO && antibiotics < cure_threshold) //spread the infection for (var/datum/organ/internal/I in internal_organs) if (I.germ_level < germ_level) diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 6dd729681de..0b9795efa70 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -59,7 +59,7 @@ if (germ_level >= INFECTION_LEVEL_TWO) var/datum/organ/external/parent = owner.get_organ(parent_organ) //spread germs - if (antibiotics < get_cure_threshold() - 5 && parent.germ_level < germ_level && ( parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30) )) + if (antibiotics < get_cure_threshold() && parent.germ_level < germ_level && ( parent.germ_level < INFECTION_LEVEL_ONE*2 || prob(30) )) parent.germ_level++ if (prob(3)) //about once every 30 seconds