diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 8c55312892..d52001066f 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -163,25 +163,31 @@ SLIME SCANNER
msg += "\tSevere brain damage detected. Subject likely to have mental traumas.\n"
else if (M.getBrainLoss() >= 45)
msg += "\tBrain damage detected.\n"
- if(iscarbon(M))
- var/obj/item/organ/liver/L = M.getorganslot("liver")
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/liver/L = H.getorganslot("liver")
if(L)
if(L.swelling > 20)
msg += "\tSubject is suffering from an enlarged liver.\n" //i.e. shrink their liver or give them a transplant.
- var/obj/item/organ/tongue/T = M.getorganslot("tongue")
- if(!T || T.damage > 40)
- msg += "\tSubject is suffering from severe burn tissue on their tongue.\n" //i.e. their tongue is shot
- if(T.name == "fluffy tongue")
- msg += "\tSubject is suffering from a fluffified tongue. Suggested cure: Yamerol or a tongue transplant.\n"
- var/obj/item/organ/lungs/Lung = M.getorganslot("lungs")
+ var/obj/item/organ/tongue/T = H.getorganslot("tongue")
+ if(T)
+ if(T.damage > 40)
+ msg += "\tSubject is suffering from severe burn tissue on their tongue.\n" //i.e. their tongue is shot
+ if(T.name == "fluffy tongue")
+ msg += "\tSubject is suffering from a fluffified tongue. Suggested cure: Yamerol or a tongue transplant.\n"
+ else
+ msg += "\tSubject's tongue is missing.\n"
+ var/obj/item/organ/lungs/Lung = H.getorganslot("lungs")
if(L)
if(Lung.damage > 150)
msg += "\tSubject is suffering from acute emphysema leading to trouble breathing.\n" //i.e. Their lungs are shot
- var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
+ else
+ msg += "\tSubject's lungs have collapsed from trauma!\n"
+ var/obj/item/organ/genital/penis/P = H.getorganslot("penis")
if(P)
if(P.length>20)
msg += "\tSubject has a sizeable gentleman's organ at [P.length] inches.\n"
- var/obj/item/organ/genital/breasts/Br = M.getorganslot("breasts")
+ var/obj/item/organ/genital/breasts/Br = H.getorganslot("breasts")
if(Br)
if(Br.cached_size>5)
msg += "\tSubject has a sizeable bosom with a [Br.size] cup.\n"
@@ -205,7 +211,7 @@ SLIME SCANNER
msg += "\tSubject has the following physiological traits: [C.get_trait_string()].\n"
if(advanced)
msg += "\tBrain Activity Level: [(200 - M.getBrainLoss())/2]%.\n"
- if (M.radiation)
+ if(M.radiation)
msg += "\tSubject is irradiated.\n"
if(advanced)
msg += "\tRadiation Level: [M.radiation]%.\n"
@@ -220,9 +226,9 @@ SLIME SCANNER
//Astrogen shenanigans
if(M.reagents.has_reagent("astral"))
if(M.mind)
- msg += "Warning: subject may be possesed.\n"
+ msg += "\tWarning: subject may be possesed.\n"
else
- msg += "Subject appears to be astrally projecting.\n"
+ msg += "\tSubject appears to be astrally projecting.\n"
//Eyes and ears
if(advanced)