From b7760b85a6ce1dff1665133f35bb28f0e8548146 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 16 Jul 2022 22:41:21 -0600 Subject: [PATCH] Adds Merge Conflicts Markers to Create_And_Destroy Blacklist (#68427) * Adds Merge Conflicts Markers to Create_And_Destroy Blacklist Hey there, My bad, I forgot this used. It was suggested to use an #IFNDEF UNIT_TESTS, but the sole purpose of this is to fail very, very loudly in any context. I don't want linters to somehow fail and have this be ignored by unit tests such that it doesn't show up during that part of CI. I want it to fail and yell at you and scream every time this motherfucker initializes, so let's not bug this fella for the purposes of this test. * small comment update * lets move it to the list --- code/modules/unit_tests/create_and_destroy.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index 586c383781a..f491b2adf9e 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -25,6 +25,8 @@ /mob/dview, //Template type /obj/item/bodypart, + //This is meant to fail extremely loud every single time it occurs in any environment in any context, and it falsely alarms when this unit test iterates it. Let's not spawn it in. + /obj/merge_conflict_marker, ) //Say it with me now, type template ignore += typesof(/obj/effect/mapping_helpers)