Merge pull request #3136 from RudiPardieck/BodyScannerFix

Bugfix: Bodyscanner now shows robotic parts in internal organs
This commit is contained in:
Mark van Alphen
2016-01-06 18:38:14 +01:00
3 changed files with 13 additions and 2 deletions
+1
View File
@@ -407,6 +407,7 @@
organData["maxHealth"] = I.max_damage
organData["bruised"] = I.min_broken_damage
organData["broken"] = I.min_bruised_damage
organData["robotic"] = I.robotic
intOrganData.Add(list(organData))
+6
View File
@@ -0,0 +1,6 @@
author: Certhic
delete-after: True
changes:
- bugfix: "Bodyscanner now sees mechanical parts in internal organs"
+6 -2
View File
@@ -188,7 +188,8 @@ Used In File(s): \code\game\machinery\adv_med.dm
<tr>
<td> {{:value.name}} <br> </td>
<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">
<td>
<span class="average">
{{if value.germ_level > 100}}
{{if value.germ_level < 300}}
mild infection <br>
@@ -204,8 +205,11 @@ Used In File(s): \code\game\machinery\adv_med.dm
acute Infection++ <br>
{{else value.germ_level >= 900}}
septic <br>
{{/if}}
{{/if}}
{{/if}}
</span>
{{if value.robotic == 1}} robotic <br> {{/if}}
{{if value.robotic == 2}} assisted <br> {{/if}}
</td>
</tr>
{{/for}}