From d6a070e6fc7cab1eb2052fd451b01a69f77dc624 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 16 Jul 2014 15:44:16 -0400 Subject: [PATCH 1/3] Improved full body scanner infection readout Now provides a higher level of precision on infection severity. --- code/game/machinery/adv_med.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index dac4bf7b00d..d14f19baad5 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -309,10 +309,18 @@ if(e.open) open = "Open:" switch (e.germ_level) - if (INFECTION_LEVEL_ONE + 50 to INFECTION_LEVEL_TWO) + if (INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200) infected = "Mild Infection:" - if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_THREE) + if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300) + infected = "Mild Infection+:" + if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400) + infected = "Mild Infection++:" + if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200) infected = "Acute Infection:" + if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300) + infected = "Acute Infection+:" + if (INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400) + infected = "Acute Infection++:" if (INFECTION_LEVEL_THREE to INFINITY) infected = "Septic:" From 13b757938d5f02d429e5d02c4d75854689a81bf7 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 16 Jul 2014 15:52:42 -0400 Subject: [PATCH 2/3] Infections raise temperature faster wrt germ_level --- code/modules/organs/organ_external.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b885d7610e0..518921e5ba5 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -392,7 +392,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_THREE, 1) + owner.species.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++ From 1eee72d11879af4ca66ec9914dad5c75d591d314 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 16 Jul 2014 15:59:18 -0400 Subject: [PATCH 3/3] Updates body scanner readout for internal organs --- code/game/machinery/adv_med.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index d14f19baad5..435c8acf15e 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -349,10 +349,18 @@ var/infection = "None" switch (i.germ_level) - if (1 to INFECTION_LEVEL_TWO) + if (1 to INFECTION_LEVEL_ONE + 200) infection = "Mild Infection:" - if (INFECTION_LEVEL_TWO to INFINITY) + if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300) + infection = "Mild Infection+:" + if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400) + infection = "Mild Infection++:" + if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200) infection = "Acute Infection:" + if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300) + infection = "Acute Infection+:" + if (INFECTION_LEVEL_TWO + 300 to INFINITY) + infection = "Acute Infection++:" dat += "" dat += "[i.name]N/A[i.damage][infection]:[mech]"