cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix Charsetup Tail Layering (#8760)

Browse Source 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-08-13 15:59:25 -07:00
committed by GitHub
parent 93f56229fe
commit e1d89c3015
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/client/preferences.dm
View File

@@ -289,7 +289,7 @@ var/list/preferences_datums = list()
popup.open(FALSE) // Skip registring onclose on the browser pane popup.open(FALSE) // Skip registring onclose on the browser pane
onclose(user, "preferences_window", src) // We want to register on the window itself 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) if(!client)
return return
@@ -318,9 +318,12 @@ var/list/preferences_datums = list()
O.pref = src O.pref = src
LAZYSET(char_render_holders, "[D]", O) LAZYSET(char_render_holders, "[D]", O)
client.screen |= O client.screen |= O
mannequin.set_dir(D)
mannequin.update_tail_showing()
mannequin.ImmediateOverlayUpdate()
var/mutable_appearance/MA = new(mannequin)
O.appearance = MA 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() /datum/preferences/proc/show_character_previews()
if(!client || !char_render_holders) if(!client || !char_render_holders)

2
code/modules/client/preferences_ch.dm
View File

@@ -28,6 +28,7 @@
feedback_add_details("admin_verb", "TSleepMusic") feedback_add_details("admin_verb", "TSleepMusic")
/* // Up-ported to Virgo, disabling here
/datum/preferences/proc/update_character_previews(var/mob/living/carbon/human/mannequin) /datum/preferences/proc/update_character_previews(var/mob/living/carbon/human/mannequin)
if(!client) if(!client)
return return
@@ -63,3 +64,4 @@
var/mutable_appearance/MA = new(mannequin) var/mutable_appearance/MA = new(mannequin)
O.appearance = MA O.appearance = MA
O.screen_loc = preview_screen_locs["[D]"] O.screen_loc = preview_screen_locs["[D]"]
*/

4
code/modules/mob/new_player/preferences_setup.dm
View File

@@ -261,10 +261,8 @@
mannequin.update_transform() //VOREStation Edit to update size/shape stuff. mannequin.update_transform() //VOREStation Edit to update size/shape stuff.
mannequin.toggle_tail(setting = animations_toggle) mannequin.toggle_tail(setting = animations_toggle)
mannequin.toggle_wing(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() /datum/preferences/proc/get_highest_job()
var/datum/job/highJob var/datum/job/highJob