Skip to content

Commit

Permalink
updates statbrowser stuff (#7716)
Browse files Browse the repository at this point in the history
gets rid of the skin menu bar, puts the buttons in the statbrowser
instead
also updates the statbrowser styling to be more tguiey (thanks
tgstation/tgstation#85257)

screenshots
<details>
BEFORE:


![Ce8Jhu1QgWEI51PC@2x](https://github.com/user-attachments/assets/9973a997-b82e-45cd-8924-a948fbef6f84)

AFTER:


![I0pR63E5XoJA5P39@2x](https://github.com/user-attachments/assets/1f536de6-a5fd-427b-aab7-c66d14532d21)

options tab:


![tAQjCHNv4LWNYyCO@2x](https://github.com/user-attachments/assets/2e5492cb-b78b-4318-886e-a881757093aa)


not to worry ux boomers, you can still get to the old reconnect buttons
and stuff by clicking on the app icon i nthe top left:


![n7DNsr2QZXzvt2kB@2x](https://github.com/user-attachments/assets/f020793e-9715-4f58-bb81-849dc11b77c6)

</details>

:cl:
add: added client settings to the statbrowser - under the "Options"
buttn
/:cl:

---------

Co-authored-by: forest2001 <[email protected]>
Co-authored-by: Git-Nivrak <[email protected]>
  • Loading branch information
3 people authored Jan 9, 2025
1 parent f019fc6 commit a902713
Show file tree
Hide file tree
Showing 32 changed files with 777 additions and 450 deletions.
1 change: 0 additions & 1 deletion code/modules/asset_cache/asset_list.dm
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
SHOULD_CALL_PARENT(FALSE)
CRASH("generate() not implemented for [type]!")


/datum/asset/changelog_item
_abstract = /datum/asset/changelog_item
var/item_filename
Expand Down
19 changes: 19 additions & 0 deletions code/modules/asset_cache/assets/sevastopol.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/datum/asset/simple/namespaced/sevastopol
assets = list(
"sevastopol_interface.woff2" = file("tgui/packages/sevastopol/sevastopol_interface.woff2"),
"sevastopol_interface.ttf" = file("tgui/packages/sevastopol/sevastopol_interface.ttf")
)
parents = list(
"sevastopol.css" = file("tgui/packages/sevastopol/sevastopol.css")
)

/datum/asset/simple/namespaced/chakrapetch
assets = list(
"chakrapetch-bold.woff2" = file("tgui/packages/chakrapetch/chakrapetch-bold.woff2"),
"chakrapetch-bold.ttf" = file("tgui/packages/chakrapetch/chakrapetch-bold.ttf"),
"chakrapetch-regular.woff2" = file("tgui/packages/chakrapetch/chakrapetch-regular.woff2"),
"chakrapetch-regular.ttf" = file("tgui/packages/chakrapetch/chakrapetch-regular.ttf"),
)
parents = list(
"chakrapetch.css" = file("tgui/packages/chakrapetch/chakrapetch.css")
)
7 changes: 6 additions & 1 deletion code/modules/client/client_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,11 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(

// Initialize tgui panel
stat_panel.initialize(
assets = list(
get_asset_datum(/datum/asset/simple/namespaced/fontawesome),
get_asset_datum(/datum/asset/simple/namespaced/sevastopol),
get_asset_datum(/datum/asset/simple/namespaced/chakrapetch),
),
inline_html = file("html/statbrowser.html"),
inline_js = file("html/statbrowser.js"),
inline_css = file("html/statbrowser.css"),
Expand Down Expand Up @@ -421,7 +426,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
apply_clickcatcher()

if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates.
winset(src, "infowindow.changelog", "background-color=#ED9F9B;font-style=bold")
stat_panel.send_message("changelog_read", FALSE)

update_fullscreen()

Expand Down
4 changes: 4 additions & 0 deletions code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
var/list/remembered_key_bindings
S["remembered_key_bindings"] >> remembered_key_bindings

S["lastchangelog"] >> lastchangelog

//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_default))
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
Expand Down Expand Up @@ -556,6 +558,8 @@

S["completed_tutorials"] << tutorial_list_to_savestring()

S["lastchangelog"] << lastchangelog

return TRUE

/datum/preferences/proc/load_character(slot)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/cm_marines/specialist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

// Spec verb macros
/mob/living/carbon/human/verb/spec_activation_one()
set category = "Specialist"
set name = "Specialist Activation One"
set hidden = TRUE

Expand All @@ -25,7 +24,6 @@
SA.handle_spec_macro()

/mob/living/carbon/human/verb/spec_activation_two()
set category = "Specialist"
set name = "Specialist Activation Two"
set hidden = TRUE

Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/new_player/login.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
lobby_window.initialize(
assets = list(
get_asset_datum(/datum/asset/simple/tgui),
get_asset_datum(/datum/asset/simple/namespaced/chakrapetch)
)
)

Expand Down
1 change: 1 addition & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,7 @@
#include "code\modules\asset_cache\assets\icon_ref_map.dm"
#include "code\modules\asset_cache\assets\lobby.dm"
#include "code\modules\asset_cache\assets\medals.dm"
#include "code\modules\asset_cache\assets\sevastopol.dm"
#include "code\modules\asset_cache\assets\tgfont.dm"
#include "code\modules\asset_cache\assets\tgui.dm"
#include "code\modules\asset_cache\assets\vending.dm"
Expand Down
Loading

0 comments on commit a902713

Please sign in to comment.