diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index bba12887a9b..b1cf9bac081 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -301,6 +301,15 @@
occupantData["reagents"] = reagentData
+ var/ingestedData[0]
+ if(H.ingested.reagent_list.len >= 1)
+ for(var/datum/reagent/R in H.ingested.reagent_list)
+ ingestedData[++ingestedData.len] = list("name" = R.name, "amount" = R.volume)
+ else
+ ingestedData = null
+
+ occupantData["ingested"] = ingestedData
+
var/extOrganData[0]
for(var/obj/item/organ/external/E in H.organs)
var/organData[0]
@@ -394,7 +403,7 @@
P.info += "Time of scan: [worldtime2stationtime(world.time)]
"
P.info += "[printing_text]"
P.info += "
Notes:
"
- P.name = "Body Scan - [href_list["name"]]"
+ P.name = "Body Scan - [href_list["name"]] ([worldtime2stationtime(world.time)])"
printing = null
printing_text = null
@@ -457,9 +466,13 @@
dat += "[extra_font]\tBlood Level %: [blood_percent] ([blood_volume] units)
"
if(occupant.reagents)
- for(var/datum/reagent/R in occupant.reagents)
+ for(var/datum/reagent/R in occupant.reagents.reagent_list)
dat += "Reagent: [R.name], Amount: [R.volume]
"
+ if(occupant.ingested)
+ for(var/datum/reagent/R in occupant.ingested.reagent_list)
+ dat += "Stomach: [R.name], Amount: [R.volume]
"
+
dat += "
"
dat += ""
dat += "| Organ | "
diff --git a/nano/templates/adv_med.tmpl b/nano/templates/adv_med.tmpl
index 2dbd997cbd5..71e02e25095 100644
--- a/nano/templates/adv_med.tmpl
+++ b/nano/templates/adv_med.tmpl
@@ -94,7 +94,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
{{:data.occupant.blood.percent}}% |
- Reagents
+ Blood Reagents
{{if data.occupant.reagents}}
{{for data.occupant.reagents}}
@@ -105,7 +105,20 @@ Used In File(s): \code\game\machinery\adv_med.dm
{{/for}}
{{else}}
- No reagents detected.
+ No blood reagents detected.
+ {{/if}}
+ Stomach Reagents
+ {{if data.occupant.ingested}}
+
+ {{for data.occupant.ingested}}
+
+ | {{:value.name}}: |
+ {{:value.amount}} |
+
+ {{/for}}
+
+ {{else}}
+ No stomach reagents detected.
{{/if}}
External Organs