From a94261524b4e3f7c09a22f1c755fd6af511d7336 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Tue, 19 Mar 2024 21:38:29 -0400 Subject: [PATCH] Fix fingerprint merging causing runtimes --- code/modules/detectivework/evidence/fingerprints.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/detectivework/evidence/fingerprints.dm b/code/modules/detectivework/evidence/fingerprints.dm index 94b579d41a5..38b94c110d3 100644 --- a/code/modules/detectivework/evidence/fingerprints.dm +++ b/code/modules/detectivework/evidence/fingerprints.dm @@ -11,12 +11,13 @@ if(F.completeness > 0) add_data(F) -/datum/forensics/fingerprints/add_data(var/datum/fingerprint/newprint) - if(!newprint || newprint.completeness <= 0) - return - for(var/datum/fingerprint/F in data) - if(F.merge(newprint)) - return +/datum/forensics/fingerprints/add_data(var/list/newdata) + for(var/datum/fingerprint/newprint in newdata) + if(!newprint || newprint.completeness <= 0) + continue + for(var/datum/fingerprint/F in data) + if(F.merge(newprint)) + continue ..() /datum/forensics/fingerprints/PopulateClone(datum/clone)