From ef7f522d34ec018cb95ab76dbe0f3e9a3b1876b5 Mon Sep 17 00:00:00 2001 From: Afevis Date: Sun, 21 Jul 2024 22:56:52 -0600 Subject: [PATCH] cleans up some formatting for the worn icons unit test (#85156) TEST_FAIL now supports multiple failure outputs, so don't need to do this list memery anymore --- code/modules/unit_tests/worn_icons.dm | 30 +++++++-------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/code/modules/unit_tests/worn_icons.dm b/code/modules/unit_tests/worn_icons.dm index 32c0b2e8fe6..5b308d9a4ff 100644 --- a/code/modules/unit_tests/worn_icons.dm +++ b/code/modules/unit_tests/worn_icons.dm @@ -53,65 +53,51 @@ continue var/icon_file //checks against all the default icon locations if one isn't defined. - var/fail_reasons - var/spacer if(cached_slot_flags & ITEM_SLOT_BACK) icon_file = 'icons/mob/clothing/back.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]") if(cached_slot_flags & ITEM_SLOT_ID) icon_file = 'icons/mob/clothing/id.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]") if(cached_slot_flags & ITEM_SLOT_GLOVES) icon_file = 'icons/mob/clothing/hands.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]") if(cached_slot_flags & ITEM_SLOT_EYES) icon_file = 'icons/mob/clothing/eyes.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]") if(cached_slot_flags & ITEM_SLOT_EARS) icon_file = 'icons/mob/clothing/ears.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]") if(cached_slot_flags & ITEM_SLOT_NECK) icon_file = 'icons/mob/clothing/neck.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]") if(cached_slot_flags & ITEM_SLOT_MASK) icon_file = 'icons/mob/clothing/mask.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]") if(cached_slot_flags & ITEM_SLOT_BELT) icon_file = 'icons/mob/clothing/belt.dmi' if(!(icon_state in icon_states(icon_file, 1))) already_warned_icons += icon_state - fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]" - spacer = "\n\t" - - if(fail_reasons) - TEST_FAIL(fail_reasons) - + TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")