Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak: Custom UI's improvement & visibility fix #902

Merged
merged 2 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/__DEFINES/color_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@
#define COLOR_THEME_OPERATIVE "#B8221F"
#define COLOR_THEME_GLASS "#75A4C4"
#define COLOR_THEME_CLOCKWORK "#CFBA47"
// SS220 ADDITION - START
#define COLOR_THEME_VAPORWAVE "#bc3ce3"
#define COLOR_THEME_DETECTIVE "#c7b08b"
#define COLOR_THEME_TRASENKNOX "#3ce375"
// SS220 ADDITION - END

// Color matrix utilities
#define COLOR_MATRIX_ADD(C) list(COLOR_RED, COLOR_GREEN, COLOR_BLUE, C)
Expand Down
6 changes: 3 additions & 3 deletions code/__HELPERS/type2type.dm
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,16 @@
return 'icons/mob/screen_white.dmi'
if("Midnight")
return 'icons/mob/screen_midnight.dmi'
// SS220 ADDITION START
// SS220 ADDITION - START
if("Vaporwave")
return 'modular_ss220/aesthetics/skin/icons/screen_vaporwave.dmi'
if("Detective")
return 'modular_ss220/aesthetics/skin/icons/screen_detective.dmi'
if("Trasen")
if("Trasenknox")
return 'modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi'
if("Clockwork")
return 'modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi'
// SS220 ADDITION END
// SS220 ADDITION - END
else
return 'icons/mob/screen_midnight.dmi'

Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,14 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
outline_color = COLOR_THEME_CLOCKWORK //if you want free gbp go fix the fact that clockwork's tooltip css is glass'
if("glass")
outline_color = COLOR_THEME_GLASS
// SS220 ADDITION - START
if("vaporwave")
outline_color = COLOR_THEME_VAPORWAVE
if("detective")
outline_color = COLOR_THEME_DETECTIVE
if("trasenknox")
outline_color = COLOR_THEME_TRASENKNOX
// SS220 ADDITION - END
else //this should never happen, hopefully
outline_color = COLOR_WHITE
if(color)
Expand Down
10 changes: 5 additions & 5 deletions code/modules/client/preference/link_processing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@
if("hear_adminhelps")
sound ^= SOUND_ADMINHELP
if("ui")
var/new_UI_style = tgui_input_list(user, "Choose your UI style", "UI style", list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "White"))
var/new_UI_style = tgui_input_list(user, "Choose your UI style", "UI style", list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "White", "Vaporwave", "Detective", "Trasenknox", "Clockwork")) // SS220 EDIT "Vaporwave, Detective, Trasenknox, Clockwork"
if(!new_UI_style)
return
switch(new_UI_style)
Expand All @@ -945,16 +945,16 @@
UI_style = "Operative"
if("White")
UI_style = "White"
// SS220 ADDITION START
// SS220 ADDITION - START
if("Vaporwave")
UI_style = "Vaporwave"
if("Detective")
UI_style = "Detective"
if("Trasen")
UI_style = "Trasen"
if("Trasenknox")
UI_style = "Trasenknox"
if("Clockwork")
UI_style = "Clockwork"
// SS220 ADDITION END
// SS220 ADDITION - END

if(ishuman(usr)) //mid-round preference changes, for aesthetics
var/mob/living/carbon/human/H = usr
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preference/preferences_mysql.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Vaporwave", "Detective", "Trasen", "Clockwork"), initial(UI_style))// SS220 ADDITIONS "Vaporwave, Detective, Trasen, Clockwork"
UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Vaporwave", "Detective", "Trasenknox", "Clockwork"), initial(UI_style)) // SS220 EDIT "Vaporwave, Detective, Trasenknox, Clockwork"
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
toggles = sanitize_integer(toggles, 0, TOGGLES_TOTAL, initial(toggles))
toggles2 = sanitize_integer(toggles2, 0, TOGGLES_2_TOTAL, initial(toggles2))
Expand Down
13 changes: 13 additions & 0 deletions code/modules/tooltip/tooltip.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@
.operative .wrap {border-color: #1E0101;}
.operative .content {color: #FFFFFF; border-color: #750000; background-color: #350000;}

/* SS220 ADDITION - START */
.clockwork .wrap {border-color: #170800;}
.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}

.vaporwave .wrap {border-color: #0c122c;}
.vaporwave .content {color: #bc3ce3; border-color: #170c2c; background-color: #1d1a22;}

.detective .wrap {border-color: #2c0F0c;}
.detective .content {color: #c7b08b; border-color: #2c0F0c; background-color: #221c1a;}

.trasenknox .wrap {border-color: #998e81;}
.trasenknox .content {color: #3ce375; border-color: #998e81; background-color: #1e1d21;}
/* SS220 ADDITION - END */

</style>
</head>
Expand Down
Binary file modified modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi
Binary file not shown.
Binary file modified modular_ss220/aesthetics/skin/icons/screen_detective.dmi
Binary file not shown.
Binary file modified modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi
Binary file not shown.