From 760941feefcf7cab19e97d354042f838e0a495f2 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Wed, 18 Mar 2026 16:38:16 -0500 Subject: [PATCH] Pun Pun does not randomize name in testing (#95430) ## About The Pull Request Pun Pun's name shouldn't randomize when we're testing Pun Pun's name Closes #95424 Closes #95437 Closes #95438 --- code/modules/mob/living/carbon/human/monkey.dm | 2 ++ code/modules/unit_tests/punpun.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/monkey.dm b/code/modules/mob/living/carbon/human/monkey.dm index 901dd56a8b9..dc7324040c9 100644 --- a/code/modules/mob/living/carbon/human/monkey.dm +++ b/code/modules/mob/living/carbon/human/monkey.dm @@ -130,6 +130,7 @@ GLOBAL_DATUM(the_one_and_only_punpun, /mob/living/carbon/human/species/monkey/pu /mob/living/carbon/human/species/monkey/punpun/proc/give_special_name() var/name_to_use = initial(name) +#ifndef UNIT_TESTS if(ancestor_name) name_to_use = ancestor_name if(ancestor_chain > 1) @@ -140,6 +141,7 @@ GLOBAL_DATUM(the_one_and_only_punpun, /mob/living/carbon/human/species/monkey/pu if(name_to_use == "Furious George") qdel(ai_controller) ai_controller = new /datum/ai_controller/monkey/angry(src) //hes always mad +#endif fully_replace_character_name(real_name, name_to_use) diff --git a/code/modules/unit_tests/punpun.dm b/code/modules/unit_tests/punpun.dm index 4d8bc34c3a3..d83e23c4eed 100644 --- a/code/modules/unit_tests/punpun.dm +++ b/code/modules/unit_tests/punpun.dm @@ -2,4 +2,4 @@ /datum/unit_test/punpun_name/Run() var/mob/living/carbon/human/species/monkey/punpun/punpun = EASY_ALLOCATE() - TEST_ASSERT_EQUAL(punpun.name, initial(punpun.name), "Pun Pun did not have [punpun.p_their()] name set") + TEST_ASSERT_EQUAL(punpun.name, /mob/living/carbon/human/species/monkey/punpun::name, "Pun Pun did not have [punpun.p_their()] name set")