added color-coded bars

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))
 

nano/css/shared.css

@@ -371,6 +371,11 @@ div.notice {
     background: #4f7529;
 }
 
+.displayBarFill.notgood {
+    color: #ffffff;
+    background: #ffb400;
+}
+
 .displayBarFill.average {
     color: #ffffff;
     background: #cd6500;

nano/templates/adv_med.tmpl

@@ -19,7 +19,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
 		<div class="itemLabelNarrow">
 			Health:
 		</div>
-		{{: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')}}
 			<div class="itemContent" style="width: 60px">
 				{{:helper.round(data.occupant.health*10)/10}}%
 			</div>
@@ -47,12 +47,6 @@ Used In File(s): \code\game\machinery\adv_med.dm
 			{{:data.occupant.bodyTempC}}&deg;C, {{:data.occupant.bodyTempF}}&deg;F
 		</div>
 	</div>
-
-	{{if data.occupant.hasVirus}}
-		<span class="bad">
-			Viral pathogen detected in blood stream.
-		</span> <br>
-	{{/if}}
 	{{if data.occupant.hasBorer}}
 		<span class="bad">
 			Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended. </span> <br>
@@ -76,32 +70,32 @@ Used In File(s): \code\game\machinery\adv_med.dm
 				<td> Brain Damage: </td>
 			</tr>
 			<tr>
-				<td> {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.bruteLoss) }} </td>
-				<td> {{:helper.displayBar(data.occupant.brainLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.brainLoss)}}  </td>
+				<td> {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth+100, (data.occupant.bruteLoss < 15) ? 'notgood' : (data.occupant.bruteLoss < 40) ? 'average' : 'bad', data.occupant.bruteLoss) }} </td>
+				<td> {{:helper.displayBar(data.occupant.brainLoss, 0, data.occupant.maxHealth+100, (data.occupant.brainLoss < 15) ? 'notgood' : (data.occupant.brainLoss < 40) ? 'average' : 'bad', data.occupant.brainLoss)}}  </td>
 			</tr>
 			<tr>
 				<td> Resp. Damage: </td>
 				<td> Radiation Level: </td>
 			</tr>
 			<tr>
-				<td> {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.oxyLoss)}} </td>
-				<td> {{:helper.displayBar(data.occupant.radLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.radLoss)}}  </td>
+				<td> {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth+100, (data.occupant.oxyLoss < 15) ? 'notgood' : (data.occupant.oxyLoss < 40) ? 'average' : 'bad', data.occupant.oxyLoss)}} </td>
+				<td> {{:helper.displayBar(data.occupant.radLoss, 0, data.occupant.maxHealth+100, (data.occupant.radLoss < 15) ? 'notgood' : (data.occupant.radLoss < 40) ? 'average' : 'bad', data.occupant.radLoss)}}  </td>
 			</tr>
 			<tr>
 				<td> Toxin Damage: </td>
 				<td> Genetic Damage: </td>
 			</tr>
 			<tr>
-				<td> {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.toxLoss)}} </td>
-				<td> {{:helper.displayBar(data.occupant.cloneLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.cloneLoss)}} </td>
+				<td> {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth+100, (data.occupant.toxLoss < 15) ? 'notgood' : (data.occupant.toxLoss < 40) ? 'average' : 'bad', data.occupant.toxLoss)}} </td>
+				<td> {{:helper.displayBar(data.occupant.cloneLoss, 0, data.occupant.maxHealth+100, (data.occupant.cloneLoss < 15) ? 'notgood' : (data.occupant.cloneLoss < 40) ? 'average' : 'bad', data.occupant.cloneLoss)}} </td>
 			</tr>
 			<tr>
 				<td> Burn Severity: </td>
 				<td> Paralysis %: ({{:data.occupant.paralysisSeconds}} seconds left) </td>
 			</tr>
 			<tr>
-				<td> {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad', data.occupant.fireLoss)}} </td>
-				<td> {{:helper.displayBar(data.occupant.paralysis, 0, data.occupant.maxHealth, 'bad', data.occupant.paralysis)}} </td>
+				<td> {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth+100, (data.occupant.fireLoss < 15) ? 'notgood' : (data.occupant.fireLoss < 40) ? 'average' : 'bad', data.occupant.fireLoss)}} </td>
+				<td> {{:helper.displayBar(data.occupant.paralysis, 0, 100, (data.occupant.paralysis < 25) ? 'notgood' : (data.occupant.paralysis < 50) ? 'average' : 'bad', data.occupant.paralysis)}} </td>
 			</tr>
 		</tbody>
 	</table>
@@ -112,42 +106,34 @@ Used In File(s): \code\game\machinery\adv_med.dm
 		<div class="line">
 			<div class="statusLabel">Pulse:</div> <div class="statusValue">{{:data.occupant.blood.pulse}} bpm</div>
 		</div>
-
 		<div class="line">
 			<div class="statusLabel">Blood Level:</div>
-			{{if data.occupant.blood.percent <= 60}}
-				{{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'bad')}}
-			<div class="statusValue">
-				{{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl
-			</div>
-			{{else data.occupant.blood.percent <= 90}}
-				{{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'average')}}
-			<div class="statusValue">
-				{{:data.occupant.blood.percent}}%, {{:data.occupant.bloodLevel}}cl
-			</div>
-			{{else}}
-				{{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, 'good')}}
-			<div class="statusValue">
-				{{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl
-			</div>
-			{{/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' )}}
+			<div class="statusValue"> {{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl </div>
 		</div>
-	{{/if}}
-	<br> <br>
 
+	{{/if}}
+	<br>
+	{{if data.occupant.hasVirus}}
+		<span class="bad">
+			Viral pathogen detected in blood stream.
+		</span> <br>
+	{{/if}}
 	<b>External Organs</b>
 	<table> <thead>
 			<tr>
-				<th style="width: 20%"> Name </th>
-				<th style="width: 20%"> Brute damage </th>
-				<th style="width: 20%"> Burn damage </th>
-				<th style="width: 40%"> Injuries </th>
+				<th style="width: 25%"> Name </th>
+				<th style='width: 15%'> Total damage </th>
+				<th style="width: 15%"> Brute damage </th>
+				<th style="width: 15%"> Burn damage </th>
+				<th style="width: 30%"> Injuries </th>
 			</tr>
 		</thead>
 		<tbody class="striped">
 			{{for data.occupant.extOrgan}}
 				<tr>
 					<td> {{:value.name}} </td>
+					<td> {{:helper.displayBar(value.totalLoss, 0, value.maxHealth, (value.totalLoss < value.bruised) ? 'notgood' : (value.totalLoss < value.broken) ? 'average' : 'bad', value.totalLoss) }} </td>
 					<td> {{if value.bruteLoss> 0}} <span class='average'> {{else}} <span> {{/if}} {{:value.bruteLoss}} </span> </td>
 					<td> {{if value.fireLoss> 0}} <span class='average'> {{else}} <span> {{/if}} {{:value.fireLoss}} </span> 	</td>
 					<td>
@@ -193,31 +179,31 @@ Used In File(s): \code\game\machinery\adv_med.dm
 	<table>	<thead>
 			<tr>
 				<th width=25%> Name </th>
-				<th width=25%> Brute damage </th>
-				<th widht=50%> Injuries </th>
+				<th width=35%> Brute damage </th>
+				<th widht=40%> Injuries </th>
 			</tr>
 		</thead>
 		<tbody class="striped">
 			{{for data.occupant.intOrgan}}
 				<tr>
 					<td> {{:value.name}} <br> </td>
-					<td> {{if value.damage > 0}} <span class='average'> {{else}} <span> {{/if}} {{:value.damage}} </span> </td>
-					<td>
-						{{if value.germ_level > 100}}
-							{{if value.germ_level < 300}}
-								mild infection <br>
-							{{else value.germ_level < 400}}
-								mild infection+ <br>
-							{{else value.germ_level < 500}}
-								mild infection++ <br>
-							{{else value.germ_level < 700}}
-								acute Infection <br>
-							{{else value.germ_level < 800}}
-								acute Infection+ <br>
-							{{else value.germ_level < 900}}
-								acute Infection++ <br>
-							{{else value.germ_level >= 900}}
-								septic <br>
+					<td> {{:helper.displayBar(value.damage, 0, value.maxHealth, (value.damage < value.bruised) ? 'notgood' : (value.damage < value.broken) ? 'average' : 'bad', value.damage) }} </td>
+					<td class="average">
+							{{if value.germ_level > 100}}
+								{{if value.germ_level < 300}}
+									mild infection <br>
+								{{else value.germ_level < 400}}
+									mild infection+ <br>
+								{{else value.germ_level < 500}}
+									mild infection++ <br>
+								{{else value.germ_level < 700}}
+									acute Infection <br>
+								{{else value.germ_level < 800}}
+									acute Infection+ <br>
+								{{else value.germ_level < 900}}
+									acute Infection++ <br>
+								{{else value.germ_level >= 900}}
+									septic <br>
 							{{/if}}
 						{{/if}}
 					</td>