From 99b1efa6a609f7ee5dab72ebe5a8f2b9d84074e5 Mon Sep 17 00:00:00 2001 From: Certh Date: Tue, 5 Jan 2016 21:29:46 +0100 Subject: [PATCH 1/2] Bugfix: Bodyscanner now sees mechanical parts in internal organs --- code/game/machinery/adv_med.dm | 1 + nano/templates/adv_med.tmpl | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 2b5366c8eac..157aebc4bc6 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -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)) diff --git a/nano/templates/adv_med.tmpl b/nano/templates/adv_med.tmpl index a8790d09310..7c32c43ff7c 100644 --- a/nano/templates/adv_med.tmpl +++ b/nano/templates/adv_med.tmpl @@ -188,7 +188,8 @@ Used In File(s): \code\game\machinery\adv_med.dm {{:value.name}}
{{: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
@@ -204,8 +205,11 @@ Used In File(s): \code\game\machinery\adv_med.dm acute Infection++
{{else value.germ_level >= 900}} septic
+ {{/if}} {{/if}} - {{/if}} +
+ {{if value.robotic == 1}} robotic
{{/if}} + {{if value.robotic == 2}} assisted
{{/if}} {{/for}} From d8617f49f518123e6e153b02fc05521653e66898 Mon Sep 17 00:00:00 2001 From: Certh Date: Wed, 6 Jan 2016 12:22:52 +0100 Subject: [PATCH 2/2] changelog --- html/changelogs/Certhic-PR-3136.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/Certhic-PR-3136.yml diff --git a/html/changelogs/Certhic-PR-3136.yml b/html/changelogs/Certhic-PR-3136.yml new file mode 100644 index 00000000000..feac7e74d52 --- /dev/null +++ b/html/changelogs/Certhic-PR-3136.yml @@ -0,0 +1,6 @@ +author: Certhic + +delete-after: True + +changes: + - bugfix: "Bodyscanner now sees mechanical parts in internal organs"