From b16ee4683cea931ca22047c58f316f7fc09a9ef5 Mon Sep 17 00:00:00 2001 From: Will <7099514+Willburd@users.noreply.github.com> Date: Fri, 27 Jun 2025 11:56:57 -0400 Subject: [PATCH] Handles duped reagent names more strictly (#17906) Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com> --- code/unit_tests/reagent_tests.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/unit_tests/reagent_tests.dm b/code/unit_tests/reagent_tests.dm index f5b147da7c5..cebd399d377 100644 --- a/code/unit_tests/reagent_tests.dm +++ b/code/unit_tests/reagent_tests.dm @@ -28,9 +28,11 @@ log_unit_test("[Rpath]: Reagents - Reagent ID must be all lowercase.") failed = TRUE - if(collection_name[R.name] && !(R.wiki_flag & WIKI_SPOILER)) // If wiki hidden it's probably intentional! - log_unit_test("[Rpath]: Reagents - WARNING - reagent name \"[R.name]\" is not unique, used first in [collection_name[R.name]]. Is this intentional?") - collection_name[R.name] = R.type + if(!(R.wiki_flag & WIKI_SPOILER)) // If wiki hidden then don't conflict test it against name, used for intentionally copied names like beer2's + if(collection_name[R.name]) + log_unit_test("[Rpath]: Reagents - reagent name \"[R.name]\" is not unique, used first in [collection_name[R.name]].") + failed = TRUE + collection_name[R.name] = R.type if(collection_id[R.id]) log_unit_test("[Rpath]: Reagents - reagent ID \"[R.id]\" is not unique, used first in [collection_id[R.id]].")