From 87386dae371157ab08e31e6a131c3b87d807a8a6 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Aug 2016 21:52:38 -0700 Subject: [PATCH] Fixed rdconsole search function not showing required reagents. --- code/modules/research/rdconsole.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 4a186f05f22..f3935826365 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -843,13 +843,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/temp_material var/c = 50 var/t - for(var/M in D.materials) + var/all_materials = D.materials + D.reagents + for(var/M in all_materials) t = linked_lathe.check_mat(D, M) temp_material += " | " if (t < 1) - temp_material += "[D.materials[M]*coeff] [CallMaterialName(M)]" + temp_material += "[all_materials[M]*coeff] [CallMaterialName(M)]" else - temp_material += " [D.materials[M]*coeff] [CallMaterialName(M)]" + temp_material += " [all_materials[M]*coeff] [CallMaterialName(M)]" c = min(c,t) if (c >= 1) @@ -953,13 +954,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, for(var/datum/design/D in matching_designs) var/temp_materials var/check_materials = 1 - for(var/M in D.materials) + var/all_materials = D.materials + D.reagents + for(var/M in all_materials) temp_materials += " | " if (!linked_imprinter.check_mat(D, M)) check_materials = 0 - temp_materials += " [D.materials[M]/coeff] [CallMaterialName(M)]" + temp_materials += " [all_materials[M]/coeff] [CallMaterialName(M)]" else - temp_materials += " [D.materials[M]/coeff] [CallMaterialName(M)]" + temp_materials += " [all_materials[M]/coeff] [CallMaterialName(M)]" if (check_materials) dat += "[D.name][temp_materials]
" else