From cf57d9d4edd9b08dc40c55f24c0a9adb93e269cc Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Tue, 21 Jul 2026 15:14:23 -0700 Subject: [PATCH] [MIRROR] winsets (#12920) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: ItsSelis <12716288+ItsSelis@users.noreply.github.com> --- .../preference_setup/general/03_body.dm | 1 - .../types/character/general/03_body.dm | 3 +- .../mob/living/carbon/human/emote_vr.dm | 10 +---- .../mob/living/carbon/human/human_movement.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 2 +- interface/skin.dmf | 28 ++----------- tgui/packages/tgui-panel/settings/themes.ts | 40 +++++++++---------- 7 files changed, 29 insertions(+), 57 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index b1b049638e..9d00bb2722 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -549,7 +549,6 @@ return TOPIC_REFRESH_UPDATE_PREVIEW if("marking_remove") var/M = params["marking"] - winshow(user, "prefs_markings_subwindow", FALSE) pref.body_markings -= M return TOPIC_REFRESH_UPDATE_PREVIEW if("marking_color") diff --git a/code/modules/client/preferences/types/character/general/03_body.dm b/code/modules/client/preferences/types/character/general/03_body.dm index a011ef15b8..7377da4a71 100644 --- a/code/modules/client/preferences/types/character/general/03_body.dm +++ b/code/modules/client/preferences/types/character/general/03_body.dm @@ -223,7 +223,8 @@ return assoc_to_keys(GLOB.tail_layer_options) /datum/preference/choiced/human/tail_layering/create_default_value() - return GLOB.tail_layer_options[2] + var/list/possible = get_choices() + return possible[2] /datum/preference/choiced/human/tail_layering/apply_to_human(mob/living/carbon/human/target, value) target.tail_layering = GLOB.tail_layer_options[value] diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 828e40fbfd..043917656f 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -1,7 +1,3 @@ -#define SWITCH_TAIL_LAYER_UPPER "Upper" -#define SWITCH_TAIL_LAYER_STANDARD "Standard" -#define SWITCH_TAIL_LAYER_LOWER "Lower" - /mob/living/carbon/human/verb/toggle_resizing_immunity() set name = "Toggle Resizing Immunity" set desc = "Toggles your ability to resist resizing attempts" @@ -76,7 +72,7 @@ var/input = tgui_input_list(src, "Select a tail layer.", "Set Tail Layer", GLOB.tail_layer_options, read_preference(/datum/preference/choiced/human/tail_layering)) if(!input) return - var/tail_option = GLOB.tail_layer_options[input] + var/tail_option = GLOB.tail_layer_options[input] if(!tail_option) return tail_layering = tail_option @@ -117,7 +113,3 @@ else message = "hides their tail." visible_message(span_filter_notice("[src] [message]")) - -#undef SWITCH_TAIL_LAYER_UPPER -#undef SWITCH_TAIL_LAYER_STANDARD -#undef SWITCH_TAIL_LAYER_LOWER diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 10b9fc8673..f75125eee8 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -307,5 +307,5 @@ /mob/living/carbon/human/set_dir(new_dir) . = ..() if(. && (species.tail || tail_style)) - //update_tail_showing() this is already called by update_inv_wear_suit + update_tail_showing() update_inv_wear_suit() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 9a19f856fb..02776b770a 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -612,7 +612,7 @@ var/icon/new_holo = getCompoundIcon(dummy) - dummy.tail_layering = TRUE + dummy.tail_layering = TAIL_UPPER_LAYER dummy.set_dir(NORTH) var/icon/new_holo_north = getCompoundIcon(dummy) dummy.set_dir(EAST) diff --git a/interface/skin.dmf b/interface/skin.dmf index 4cbc975bb7..2b75ca888d 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1411,30 +1411,6 @@ window "popupwindow" statusbar = false can-resize = false -window "prefs_markings_subwindow" - elem "prefs_markings_subwindow" - type = MAIN - pos = 281,0 - size = 400x400 - anchor1 = -1,-1 - anchor2 = -1,-1 - background-color = none - is-visible = false - saved-params = "pos;size;is-minimized;is-maximized" - title = "Marking Selection Editing" - statusbar = false - can-minimize = false - outer-size = 416x439 - inner-size = 400x400 - elem "prefs_markings_browser" - type = BROWSER - pos = 0,0 - size = 400x400 - anchor1 = -1,-1 - anchor2 = -1,-1 - background-color = none - saved-params = "" - window "rpane" elem "rpane" type = MAIN @@ -1691,3 +1667,7 @@ window "statwindow" anchor2 = 100,100 is-visible = false saved-params = "" + +window "character_preview_map" + elem "character_preview_map" + type = BROWSER diff --git a/tgui/packages/tgui-panel/settings/themes.ts b/tgui/packages/tgui-panel/settings/themes.ts index 14f274b5b0..53b2442d72 100644 --- a/tgui/packages/tgui-panel/settings/themes.ts +++ b/tgui/packages/tgui-panel/settings/themes.ts @@ -134,8 +134,8 @@ export function setClientTheme(name) { Byond.winset({ // Main windows - 'infowindow.background-color': COLOR_DARK_BG, - 'infowindow.text-color': COLOR_DARK_TEXT, + //'infowindow.background-color': COLOR_DARK_BG, + //'infowindow.text-color': COLOR_DARK_TEXT, //'info.background-color': COLOR_DARK_BG, //'info.text-color': COLOR_DARK_TEXT, 'browseroutput.background-color': COLOR_DARK_BG, @@ -143,17 +143,17 @@ export function setClientTheme(name) { 'outputwindow.background-color': COLOR_DARK_BG, 'outputwindow.text-color': COLOR_DARK_TEXT, 'mainwindow.background-color': COLOR_DARK_BG, - 'split.background-color': COLOR_DARK_BG, + //'split.background-color': COLOR_DARK_BG, // Buttons - 'changelog.background-color': '#494949', - 'changelog.text-color': COLOR_DARK_TEXT, + //'changelog.background-color': '#494949', + //'changelog.text-color': COLOR_DARK_TEXT, //'rules.background-color': '#494949', //'rules.text-color': COLOR_DARK_TEXT, - 'wiki.background-color': '#494949', - 'wiki.text-color': COLOR_DARK_TEXT, - 'forum.background-color': '#494949', - 'forum.text-color': COLOR_DARK_TEXT, - 'github.background-color': '#3a3a3a', + //'wiki.background-color': '#494949', + //'wiki.text-color': COLOR_DARK_TEXT, + //'forum.background-color': '#494949', + //'forum.text-color': COLOR_DARK_TEXT, + 'github.background-color': '#494949', 'github.text-color': COLOR_DARK_TEXT, //'report-issue.background-color': '#492020', //'report-issue.text-color': COLOR_DARK_TEXT, @@ -162,19 +162,19 @@ export function setClientTheme(name) { 'output.text-color': COLOR_DARK_TEXT, 'statwindow.background-color': COLOR_DARK_BG_DARKER, 'statwindow.text-color': COLOR_DARK_TEXT, - 'stat.background-color': COLOR_DARK_BG_DARKER, - 'stat.tab-background-color': COLOR_DARK_BG, - 'stat.text-color': COLOR_DARK_TEXT, - 'stat.tab-text-color': COLOR_DARK_TEXT, - 'stat.prefix-color': COLOR_DARK_TEXT, - 'stat.suffix-color': COLOR_DARK_TEXT, + //'stat.background-color': COLOR_DARK_BG_DARKER, + //'stat.tab-background-color': COLOR_DARK_BG, + //'stat.text-color': COLOR_DARK_TEXT, + //'stat.tab-text-color': COLOR_DARK_TEXT, + //'stat.prefix-color': COLOR_DARK_TEXT, + //'stat.suffix-color': COLOR_DARK_TEXT, // Say, OOC, me Buttons etc. 'saybutton.background-color': COLOR_DARK_BG, 'saybutton.text-color': COLOR_DARK_TEXT, - 'oocbutton.background-color': COLOR_DARK_BG, - 'oocbutton.text-color': COLOR_DARK_TEXT, - 'mebutton.background-color': COLOR_DARK_BG, - 'mebutton.text-color': COLOR_DARK_TEXT, + //'oocbutton.background-color': COLOR_DARK_BG, + //'oocbutton.text-color': COLOR_DARK_TEXT, + //'mebutton.background-color': COLOR_DARK_BG, + //'mebutton.text-color': COLOR_DARK_TEXT, 'asset_cache_browser.background-color': COLOR_DARK_BG, 'asset_cache_browser.text-color': COLOR_DARK_TEXT, 'tooltip.background-color': COLOR_DARK_BG,