From e1d89c3015bcbac56f0dcbef846dfbf425cf635c Mon Sep 17 00:00:00 2001
From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:59:25 -0700
Subject: [PATCH] [MIRROR] Fix Charsetup Tail Layering (#8760)

Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
---
 code/modules/client/preferences.dm               | 9 ++++++---
 code/modules/client/preferences_ch.dm            | 2 ++
 code/modules/mob/new_player/preferences_setup.dm | 4 +---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index fac47c8a49..dcf2851f14 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -289,7 +289,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) //CHOMPEdit _ch override.
+/datum/preferences/proc/update_character_previews(var/mob/living/carbon/human/mannequin)
 	if(!client)
 		return
 
@@ -318,9 +318,12 @@ 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]"]*/
+		O.screen_loc = preview_screen_locs["[D]"]
 
 /datum/preferences/proc/show_character_previews()
 	if(!client || !char_render_holders)
diff --git a/code/modules/client/preferences_ch.dm b/code/modules/client/preferences_ch.dm
index 94a82233ce..58e9bb61e7 100644
--- a/code/modules/client/preferences_ch.dm
+++ b/code/modules/client/preferences_ch.dm
@@ -28,6 +28,7 @@
 
 	feedback_add_details("admin_verb", "TSleepMusic")
 
+/* // Up-ported to Virgo, disabling here
 /datum/preferences/proc/update_character_previews(var/mob/living/carbon/human/mannequin)
 	if(!client)
 		return
@@ -63,3 +64,4 @@
 		var/mutable_appearance/MA = new(mannequin)
 		O.appearance = MA
 		O.screen_loc = preview_screen_locs["[D]"]
+*/
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 839c4846f4..6a18c482dc 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() //CHOMPEdit. Moved to preferences_ch.dm
-	//mannequin.ImmediateOverlayUpdate() //CHOMPEdit
 
-	update_character_previews(mannequin) //CHOMPEdit
+	update_character_previews(mannequin)
 
 /datum/preferences/proc/get_highest_job()
 	var/datum/job/highJob