From d3f05f7830141196981b53fcea09eb934870f31e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 2 Oct 2022 08:44:02 -0700 Subject: [PATCH] Revert "Allow AI, mime, clown to have the same name as LITERALLY ANY MOB IN THE WORLD(???)" --- code/__HELPERS/unsorted.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index d054734611..73b2dd3006 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -173,10 +173,10 @@ Turf and target are separate in case you want to teleport some distance from a t var/banned = jobban_isbanned(src, "appearance") - if(C?.prefs?.custom_names[role] && !banned) - newname = C.prefs.custom_names[role] - else - while(loop && safety < 5) + while(loop && safety < 5) + if(C && C.prefs.custom_names[role] && !safety && !banned) + newname = C.prefs.custom_names[role] + else switch(role) if("human") newname = random_unique_name(gender)