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

Merge pull request #5890 from CHOMPStation2/upstream-merge-14519

Browse Source 
[MIRROR] [MIRROR] allows animations to be toggled in preferences
This commit is contained in:
Nadyr
2023-03-09 22:18:05 -05:00
committed by GitHub
parent deb7221578 2b80eab86e
commit 0cb04f7a19
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -2,6 +2,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/preferences /datum/preferences
var/equip_preview_mob = EQUIP_PREVIEW_ALL var/equip_preview_mob = EQUIP_PREVIEW_ALL
var/animations_toggle = FALSE
var/icon/bgstate = "000" var/icon/bgstate = "000"
var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced") 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
. += "<br><a href='?src=\ref[src];cycle_bg=1'>Cycle background</a>" . += "<br><a href='?src=\ref[src];cycle_bg=1'>Cycle background</a>"
. += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_LOADOUT]'>[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]</a>" . += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_LOADOUT]'>[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]</a>"
. += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_JOB]'>[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]</a>" . += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_JOB]'>[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]</a>"
. += "<br><a href='?src=\ref[src];toggle_animations=1'>[pref.animations_toggle ? "Stop animations" : "Show animations"]</a>"
. += "</td></tr></table>" . += "</td></tr></table>"
. += "<b>Hair</b><br>" . += "<b>Hair</b><br>"
@@ -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"]) pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"])
return TOPIC_REFRESH_UPDATE_PREVIEW 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"]) else if(href_list["synth_color"])
pref.synth_color = !pref.synth_color pref.synth_color = !pref.synth_color
return TOPIC_REFRESH_UPDATE_PREVIEW return TOPIC_REFRESH_UPDATE_PREVIEW

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

@@ -259,8 +259,8 @@
mannequin.delete_inventory(TRUE) mannequin.delete_inventory(TRUE)
dress_preview_mob(mannequin) dress_preview_mob(mannequin)
mannequin.update_transform() //VOREStation Edit to update size/shape stuff. mannequin.update_transform() //VOREStation Edit to update size/shape stuff.
mannequin.toggle_tail(setting = TRUE) mannequin.toggle_tail(setting = animations_toggle)
mannequin.toggle_wing(setting = TRUE) mannequin.toggle_wing(setting = animations_toggle)
mannequin.update_tail_showing() mannequin.update_tail_showing()
mannequin.ImmediateOverlayUpdate() mannequin.ImmediateOverlayUpdate()