From 6fa729334cda8cee069849870e518fe3b2ec309f Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 13 Nov 2021 23:31:50 -0500 Subject: [PATCH 1/2] Merge pull request #11822 from Heroman3003/printfix Fixes double counting of implants on scanner printout --- code/game/machinery/adv_med.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index c2170d5b7b..4db1975948 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -219,7 +219,7 @@ if(H.reagents.reagent_list.len >= 1) for(var/datum/reagent/R in H.reagents.reagent_list) reagentData[++reagentData.len] = list( - "name" = R.name, + "name" = R.name, "amount" = R.volume, "overdose" = (R.overdose && R.volume > R.overdose) ? TRUE : FALSE, ) @@ -291,7 +291,7 @@ if(istype(E, /obj/item/organ/external/chest) && H.is_lung_ruptured()) organData["lungRuptured"] = 1 - + for(var/datum/wound/W in E.wounds) if(W.internal) organData["internalBleeding"] = 1 @@ -479,7 +479,7 @@ var/obj/item/device/nif/N = I //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" - if(istype(N) && N.known_implant) //VOREStation Add: NIFs + else if(istype(N) && N.known_implant) //VOREStation Add: NIFs imp += "[N] implanted:" else unknown_body++