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/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"
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
 				<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}}