From 0af4214f611f54f20be847854ffcef383d447cf9 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:21:47 +1000 Subject: [PATCH 1/2] Merge pull request #14519 from VOREStation/upstream-merge-8944 [MIRROR] allows animations to be toggled in preferences --- code/modules/client/preference_setup/general/03_body.dm | 6 ++++++ code/modules/mob/new_player/preferences_setup.dm | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 353d5ea49e..6b270d056e 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -2,6 +2,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O /datum/preferences var/equip_preview_mob = EQUIP_PREVIEW_ALL + var/animations_toggle = FALSE var/icon/bgstate = "000" var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced") @@ -569,6 +570,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O . += "
Cycle background" . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]" . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]" + . += "
[pref.animations_toggle ? "Stop animations" : "Show animations"]" . += "" . += "Hair
" @@ -1154,6 +1156,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"]) return TOPIC_REFRESH_UPDATE_PREVIEW + else if(href_list["toggle_animations"]) + pref.animations_toggle = !pref.animations_toggle + return TOPIC_REFRESH_UPDATE_PREVIEW + else if(href_list["synth_color"]) pref.synth_color = !pref.synth_color return TOPIC_REFRESH_UPDATE_PREVIEW diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index f3dfe624ba..52dbf78507 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -259,8 +259,8 @@ mannequin.delete_inventory(TRUE) dress_preview_mob(mannequin) mannequin.update_transform() //VOREStation Edit to update size/shape stuff. - mannequin.toggle_tail(setting = TRUE) - mannequin.toggle_wing(setting = TRUE) + mannequin.toggle_tail(setting = animations_toggle) + mannequin.toggle_wing(setting = animations_toggle) mannequin.update_tail_showing() mannequin.ImmediateOverlayUpdate()