From c44fa8d4700bb9b02ff1efe9ad1713da0041dd94 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 5 May 2014 17:18:55 +0930 Subject: [PATCH] Fixes #4534 Conflicts: code/game/machinery/adv_med.dm --- code/game/machinery/adv_med.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 5c61d2cf226..467c42b33d8 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -164,6 +164,7 @@ /obj/machinery/body_scanconsole var/obj/machinery/bodyscanner/connected + var/known_implants = list(/obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking) var/delete var/temphtml name = "Body Scanner Console" @@ -281,6 +282,7 @@ dat += "" for(var/datum/organ/external/e in occupant.organs) + dat += "" var/AN = "" var/open = "" @@ -306,8 +308,16 @@ robot = "Prosthetic:" if(e.open) open = "Open:" - if(e.implants.len) - imp = "Unknown body present:" + + var/unknown_body = 0 + for(var/I in e.implants) + if(is_type_in_list(I,known_implants)) + imp += "[I] implanted:" + else + unknown_body++ + + if(unknown_body || e.hidden) + imp += "Unknown body present:" if(!AN && !open && !infected & !imp) AN = "None:" if(!(e.status & ORGAN_DESTROYED))