From 22610828be282c3585aeb806ea723ca3c7ce619e Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 8 Apr 2021 12:28:37 -0400 Subject: [PATCH 1/2] Fixes two bugs. -Fixes a typo in chems -Fixes NIFs not appearing on health scanners --- code/game/machinery/adv_med.dm | 9 +++++++++ .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 08e22f96e0e..c6a2f008ddd 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -260,6 +260,12 @@ implantSubData["name"] = I.name implantSubData["known"] = istype(I) && I.known_implant implantData.Add(list(implantSubData)) + //VOREStation Add: NIFs + var/obj/item/device/nif/N = thing + implantSubData["name"] = N.name + implantSubData["known"] = istype(N) && N.known_implant + implantData.Add(list(implantSubData)) + //VOREStation Add End organData["implants"] = implantData organData["implants_len"] = implantData.len @@ -464,8 +470,11 @@ var/unknown_body = 0 for(var/thing in e.implants) var/obj/item/weapon/implant/I = thing + var/obj/item/device/nif/N = thing //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" + if(istype(N) && N.known_implant) //VOREStation Add: NIFs + imp += "[N] implanted:" else unknown_body++ diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index ea23d01a0a6..98b8f9c841a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1450,7 +1450,7 @@ /datum/reagent/qerr_quem name = "Qerr-quem" - id = "querr_quem" + id = "qerr_quem" description = "A potent stimulant and anti-anxiety medication, made for the Qerr-Katish." taste_description = "mint" reagent_state = LIQUID From 867420ceacd3c81d71c851aed67c458d8c6a04a3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 8 Apr 2021 16:56:06 -0400 Subject: [PATCH 2/2] Removes duplicates --- code/game/machinery/adv_med.dm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index c6a2f008ddd..d172e0e8dbc 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -257,15 +257,17 @@ for(var/obj/thing in E.implants) var/implantSubData[0] var/obj/item/weapon/implant/I = thing - implantSubData["name"] = I.name - implantSubData["known"] = istype(I) && I.known_implant - implantData.Add(list(implantSubData)) - //VOREStation Add: NIFs + //VOREStation Block Edit Start var/obj/item/device/nif/N = thing - implantSubData["name"] = N.name - implantSubData["known"] = istype(N) && N.known_implant - implantData.Add(list(implantSubData)) - //VOREStation Add End + if(istype(I)) + implantSubData["name"] = I.name + implantSubData["known"] = istype(I) && I.known_implant + implantData.Add(list(implantSubData)) + else + implantSubData["name"] = N.name + implantSubData["known"] = istype(N) && N.known_implant + implantData.Add(list(implantSubData)) + //VOREStation Block Edit End organData["implants"] = implantData organData["implants_len"] = implantData.len