diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index a29d39743ed..1d585c9c894 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -139,14 +139,15 @@ REAGENT SCANNER
if(M.status_flags & FAKEDEATH)
OX = fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal"
user.show_message("[OX] | [TX] | [BU] | [BR]")
- if (istype(M, /mob/living/carbon))
- if(M:reagents.total_volume > 0)
+ if(istype(M, /mob/living/carbon))
+ var/mob/living/carbon/C = M
+ if(C.reagents.total_volume)
var/unknown = 0
var/reagentdata[0]
- for(var/A in M.reagents.reagent_list)
+ for(var/A in C.reagents.reagent_list)
var/datum/reagent/R = A
if(R.scannable)
- reagentdata["[R.id]"] = "\t \blue [round(M.reagents.get_reagent_amount(R.id), 1)]u [R.name]"
+ reagentdata["[R.id]"] = "\t \blue [round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]"
else
unknown++
if(reagentdata.len)
@@ -155,8 +156,16 @@ REAGENT SCANNER
user.show_message(reagentdata[d])
if(unknown)
user.show_message(text("\red Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood."))
- if(M:virus2.len)
- var/mob/living/carbon/C = M
+ if(C.ingested && C.ingested.total_volume)
+ var/unknown = 0
+ for(var/datum/reagent/R in C.ingested.reagent_list)
+ if(R.scannable)
+ user << "[R.name] found in subject's stomach."
+ else
+ ++unknown
+ if(unknown)
+ user << "Non-medical reagent[(unknown > 1)?"s":""] found in subject's stomach."
+ if(C.virus2.len)
for (var/ID in C.virus2)
if (ID in virusDB)
var/datum/data/record/V = virusDB[ID]