diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index d15df37c062..2b5366c8eac 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -354,6 +354,10 @@
organData["germ_level"] = E.germ_level
organData["bruteLoss"] = E.brute_dam
organData["fireLoss"] = E.burn_dam
+ organData["totalLoss"] = E.brute_dam + E.burn_dam
+ organData["maxHealth"] = E.max_damage
+ organData["bruised"] = E.min_bruised_damage
+ organData["broken"] = E.min_broken_damage
var/implantData[0]
for(var/obj/I in E.implants)
@@ -400,6 +404,9 @@
organData["desc"] = I.desc
organData["germ_level"] = I.germ_level
organData["damage"] = I.damage
+ organData["maxHealth"] = I.max_damage
+ organData["bruised"] = I.min_broken_damage
+ organData["broken"] = I.min_bruised_damage
intOrganData.Add(list(organData))
diff --git a/nano/css/shared.css b/nano/css/shared.css
index 0e6568abf07..67d726f5ebd 100644
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -371,6 +371,11 @@ div.notice {
background: #4f7529;
}
+.displayBarFill.notgood {
+ color: #ffffff;
+ background: #ffb400;
+}
+
.displayBarFill.average {
color: #ffffff;
background: #cd6500;
diff --git a/nano/templates/adv_med.tmpl b/nano/templates/adv_med.tmpl
index 675ed51c8e5..a8790d09310 100644
--- a/nano/templates/adv_med.tmpl
+++ b/nano/templates/adv_med.tmpl
@@ -19,7 +19,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
Health:
- {{:helper.displayBar(data.occupant.health, 0, 100, (data.occupant.health >= 50) ? 'good' : (data.occupant.health >= 25) ? 'average' : 'bad')}}
+ {{:helper.displayBar(data.occupant.health, -100, 100, (data.occupant.health >= 50) ? 'good' : (data.occupant.health >= 0) ? 'average' : 'bad')}}
{{:helper.round(data.occupant.health*10)/10}}%
@@ -47,12 +47,6 @@ Used In File(s): \code\game\machinery\adv_med.dm
{{:data.occupant.bodyTempC}}°C, {{:data.occupant.bodyTempF}}°F
-
- {{if data.occupant.hasVirus}}
-
- Viral pathogen detected in blood stream.
-
- {{/if}}
{{if data.occupant.hasBorer}}
Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.
@@ -76,32 +70,32 @@ Used In File(s): \code\game\machinery\adv_med.dm
Brain Damage: |
- | {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.bruteLoss) }} |
- {{:helper.displayBar(data.occupant.brainLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.brainLoss)}} |
+ {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth+100, (data.occupant.bruteLoss < 15) ? 'notgood' : (data.occupant.bruteLoss < 40) ? 'average' : 'bad', data.occupant.bruteLoss) }} |
+ {{:helper.displayBar(data.occupant.brainLoss, 0, data.occupant.maxHealth+100, (data.occupant.brainLoss < 15) ? 'notgood' : (data.occupant.brainLoss < 40) ? 'average' : 'bad', data.occupant.brainLoss)}} |
| Resp. Damage: |
Radiation Level: |
- | {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.oxyLoss)}} |
- {{:helper.displayBar(data.occupant.radLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.radLoss)}} |
+ {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth+100, (data.occupant.oxyLoss < 15) ? 'notgood' : (data.occupant.oxyLoss < 40) ? 'average' : 'bad', data.occupant.oxyLoss)}} |
+ {{:helper.displayBar(data.occupant.radLoss, 0, data.occupant.maxHealth+100, (data.occupant.radLoss < 15) ? 'notgood' : (data.occupant.radLoss < 40) ? 'average' : 'bad', data.occupant.radLoss)}} |
| Toxin Damage: |
Genetic Damage: |
- | {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.toxLoss)}} |
- {{:helper.displayBar(data.occupant.cloneLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.cloneLoss)}} |
+ {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth+100, (data.occupant.toxLoss < 15) ? 'notgood' : (data.occupant.toxLoss < 40) ? 'average' : 'bad', data.occupant.toxLoss)}} |
+ {{:helper.displayBar(data.occupant.cloneLoss, 0, data.occupant.maxHealth+100, (data.occupant.cloneLoss < 15) ? 'notgood' : (data.occupant.cloneLoss < 40) ? 'average' : 'bad', data.occupant.cloneLoss)}} |
| Burn Severity: |
Paralysis %: ({{:data.occupant.paralysisSeconds}} seconds left) |
- | {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.fireLoss)}} |
- {{:helper.displayBar(data.occupant.paralysis, 0, data.occupant.maxHealth, 'bad', data.occupant.paralysis)}} |
+ {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth+100, (data.occupant.fireLoss < 15) ? 'notgood' : (data.occupant.fireLoss < 40) ? 'average' : 'bad', data.occupant.fireLoss)}} |
+ {{:helper.displayBar(data.occupant.paralysis, 0, 100, (data.occupant.paralysis < 25) ? 'notgood' : (data.occupant.paralysis < 50) ? 'average' : 'bad', data.occupant.paralysis)}} |
@@ -112,42 +106,34 @@ Used In File(s): \code\game\machinery\adv_med.dm
Pulse:
{{:data.occupant.blood.pulse}} bpm
-
Blood Level:
- {{if data.occupant.blood.percent <= 60}}
- {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'bad')}}
-
- {{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl
-
- {{else data.occupant.blood.percent <= 90}}
- {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'average')}}
-
- {{:data.occupant.blood.percent}}%, {{:data.occupant.bloodLevel}}cl
-
- {{else}}
- {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'good')}}
-
- {{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl
-
- {{/if}}
+ {{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, (data.occupant.blood.percent <= 60) ? 'bad' : (data.occupant.blood.percent <= 90) ? 'average' : 'good' )}}
+
{{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl
- {{/if}}
-
+ {{/if}}
+
+ {{if data.occupant.hasVirus}}
+
+ Viral pathogen detected in blood stream.
+
+ {{/if}}
External Organs
- | Name |
- Brute damage |
- Burn damage |
- Injuries |
+ Name |
+ Total damage |
+ Brute damage |
+ Burn damage |
+ Injuries |
{{for data.occupant.extOrgan}}
| {{:value.name}} |
+ {{:helper.displayBar(value.totalLoss, 0, value.maxHealth, (value.totalLoss < value.bruised) ? 'notgood' : (value.totalLoss < value.broken) ? 'average' : 'bad', value.totalLoss) }} |
{{if value.bruteLoss> 0}} {{else}} {{/if}} {{:value.bruteLoss}} |
{{if value.fireLoss> 0}} {{else}} {{/if}} {{:value.fireLoss}} |
@@ -193,31 +179,31 @@ Used In File(s): \code\game\machinery\adv_med.dm
| Name |
- Brute damage |
- Injuries |
+ Brute damage |
+ Injuries |
{{for data.occupant.intOrgan}}
{{:value.name}} |
- {{if value.damage > 0}} {{else}} {{/if}} {{:value.damage}} |
-
- {{if value.germ_level > 100}}
- {{if value.germ_level < 300}}
- mild infection
- {{else value.germ_level < 400}}
- mild infection+
- {{else value.germ_level < 500}}
- mild infection++
- {{else value.germ_level < 700}}
- acute Infection
- {{else value.germ_level < 800}}
- acute Infection+
- {{else value.germ_level < 900}}
- acute Infection++
- {{else value.germ_level >= 900}}
- septic
+ | {{:helper.displayBar(value.damage, 0, value.maxHealth, (value.damage < value.bruised) ? 'notgood' : (value.damage < value.broken) ? 'average' : 'bad', value.damage) }} |
+
+ {{if value.germ_level > 100}}
+ {{if value.germ_level < 300}}
+ mild infection
+ {{else value.germ_level < 400}}
+ mild infection+
+ {{else value.germ_level < 500}}
+ mild infection++
+ {{else value.germ_level < 700}}
+ acute Infection
+ {{else value.germ_level < 800}}
+ acute Infection+
+ {{else value.germ_level < 900}}
+ acute Infection++
+ {{else value.germ_level >= 900}}
+ septic
{{/if}}
{{/if}}
|
|