From 60c6a2ea9202f03f228c9b15d6d7be68d31e4a3e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 23 Jul 2014 22:34:04 -0400 Subject: [PATCH 1/3] Fixes fever temperature not being reached --- code/modules/organs/organ_external.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b87fa2f2772..0741b0fb12b 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -393,10 +393,10 @@ Note that amputating the affected organ does in fact remove the infection from t if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature - var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/(INFECTION_LEVEL_ONE+300), 1) + owner.species.body_temperature - if (owner.bodytemperature < fever_temperature) - //world << "fever: [owner.bodytemperature] < [fever_temperature], raising temperature." - owner.bodytemperature++ + var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/(INFECTION_LEVEL_TWO), 1) + owner.species.body_temperature + if (fever_temperature > owner.bodytemperature) + //need to make sure we raise temperature fast enough to get around environmental cooling preventing us from reaching fever_temperature + owner.bodytemperature += (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1 if(prob(round(germ_level/10))) if (antibiotics < 5) From d9f70c2fd2f377fe4719612841dddcff158d845f Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 23 Jul 2014 22:35:04 -0400 Subject: [PATCH 2/3] Adjusts the rate that infections deal toxin damage --- code/modules/organs/organ_external.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 0741b0fb12b..80ac3bf37b5 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -393,7 +393,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature - var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/(INFECTION_LEVEL_TWO), 1) + owner.species.body_temperature + var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_TWO, 1) + owner.species.body_temperature if (fever_temperature > owner.bodytemperature) //need to make sure we raise temperature fast enough to get around environmental cooling preventing us from reaching fever_temperature owner.bodytemperature += (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1 @@ -402,7 +402,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (antibiotics < 5) germ_level++ - if (prob(5)) //adjust this to tweak how fast people take toxin damage from infections + if (prob(10)) //adjust this to tweak how fast people take toxin damage from infections owner.adjustToxLoss(1) if(germ_level >= INFECTION_LEVEL_TWO && antibiotics < 5) From 78e4e259db901df447a0502713cf15aad2977afc Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 23 Jul 2014 22:41:52 -0400 Subject: [PATCH 3/3] Fixes icons not being updated for necrosis --- code/modules/organs/organ_external.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 80ac3bf37b5..ea0590152e3 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -441,6 +441,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (!(status & ORGAN_DEAD)) status |= ORGAN_DEAD owner << "You can't feel your [display_name] anymore..." + owner.update_body(1) germ_level++ owner.adjustToxLoss(1)