From de3ebb5333c48c25a121d5dbbd6edde229400eeb Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Sun, 11 Aug 2024 20:17:47 +0100
Subject: [PATCH] fix charsetup tail layering (#16166)

---
 code/modules/client/preferences.dm               | 7 +++++--
 code/modules/mob/new_player/preferences_setup.dm | 4 +---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index f4681dd1e87..34b4f7e3588 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -290,7 +290,7 @@ var/list/preferences_datums = list()
 	popup.open(FALSE) // Skip registring onclose on the browser pane
 	onclose(user, "preferences_window", src) // We want to register on the window itself
 
-/datum/preferences/proc/update_character_previews(mutable_appearance/MA)
+/datum/preferences/proc/update_character_previews(var/mob/living/carbon/human/mannequin)
 	if(!client)
 		return
 
@@ -319,8 +319,11 @@ var/list/preferences_datums = list()
 			O.pref = src
 			LAZYSET(char_render_holders, "[D]", O)
 			client.screen |= O
+		mannequin.set_dir(D)
+		mannequin.update_tail_showing()
+		mannequin.ImmediateOverlayUpdate()
+		var/mutable_appearance/MA = new(mannequin)
 		O.appearance = MA
-		O.dir = D
 		O.screen_loc = preview_screen_locs["[D]"]
 
 /datum/preferences/proc/show_character_previews()
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 6568bab6168..6a18c482dce 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -261,10 +261,8 @@
 	mannequin.update_transform() //VOREStation Edit to update size/shape stuff.
 	mannequin.toggle_tail(setting = animations_toggle)
 	mannequin.toggle_wing(setting = animations_toggle)
-	mannequin.update_tail_showing()
-	mannequin.ImmediateOverlayUpdate()
 
-	update_character_previews(new /mutable_appearance(mannequin))
+	update_character_previews(mannequin)
 
 /datum/preferences/proc/get_highest_job()
 	var/datum/job/highJob