From 355de66eeb8cddd003ef43e8b9cba94babd9c6b0 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Tue, 7 Nov 2017 16:01:36 +0200 Subject: [PATCH 1/2] Allows non-humans to be chem scanned via the health analyzer (#32457) --- code/game/objects/items/devices/scanners.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 9a60d19e1f..9865f0bfb3 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -280,18 +280,17 @@ MASS SPECTROMETER to_chat(user, "[cyberimp_detect]") /proc/chemscan(mob/living/user, mob/living/M) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.reagents) - if(H.reagents.reagent_list.len) + if(istype(M)) + if(M.reagents) + if(M.reagents.reagent_list.len) to_chat(user, "Subject contains the following reagents:") - for(var/datum/reagent/R in H.reagents.reagent_list) + for(var/datum/reagent/R in M.reagents.reagent_list) to_chat(user, "[R.volume] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]") else to_chat(user, "Subject contains no reagents.") - if(H.reagents.addiction_list.len) + if(M.reagents.addiction_list.len) to_chat(user, "Subject is addicted to the following reagents:") - for(var/datum/reagent/R in H.reagents.addiction_list) + for(var/datum/reagent/R in M.reagents.addiction_list) to_chat(user, "[R.name]") else to_chat(user, "Subject is not addicted to any reagents.")