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.

Sign up for GitHub

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

Fixes boosty button theme. Some adjucements to interface buttons. #698

Merged
merged 3 commits into from
Nov 28, 2024
Merged

Fixes boosty button theme. Some adjucements to interface buttons. #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31814c1
Update themes.ts
Helg2 Nov 25, 2024
d444ba8
Update skin.dmf
Helg2 Nov 25, 2024
25f795c
Update interface.dm
Helg2 Nov 25, 2024
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
17 changes: 6 additions & 11 deletions interface/interface.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
to_chat(src, span_warning("The wiki URL is not set in the server configuration."))
return

if(alert("This will open the wiki in your browser. Are you sure?", "Wiki", "Yes", "No") != "Yes")
if(tgui_alert(src, "This will open the wiki in your browser. Are you sure?", "Wiki", list("Yes", "No"), 0) != "Yes")
return

DIRECT_OUTPUT(src, link(CONFIG_GET(string/wikiurl)))


/client/verb/boosty()
set name = "boosty"
set hidden = TRUE
Expand All @@ -21,12 +20,11 @@
to_chat(src, span_warning("The donation URL is not set in the server configuration."))
return

if(alert("This will open the boosty in your browser. Are you sure?", "Forum", "Yes", "No") != "Yes")
if(tgui_alert(src, "This will open the boosty in your browser. Are you sure?", "Forum", list("Yes", "No"), 0) != "Yes")
return

DIRECT_OUTPUT(src, link(CONFIG_GET(string/donationurl)))


/client/verb/rules()
set name = "rules"
set hidden = TRUE
Expand All @@ -35,12 +33,11 @@
to_chat(src, span_warning("The rules URL is not set in the server configuration."))
return

if(alert("This will open the rules in your browser. Are you sure?", "Rules", "Yes", "No") != "Yes")
if(tgui_alert("This will open the rules in your browser. Are you sure?", "Rules", list("Yes", "No"), 0) != "Yes")
return

DIRECT_OUTPUT(src, link(CONFIG_GET(string/rulesurl)))


/client/verb/discord()
set name = "discord"
set hidden = TRUE
Expand All @@ -49,12 +46,11 @@
to_chat(src, span_warning("The Discord URL is not set in the server configuration."))
return

if(alert("This will open our Discord in your browser. Are you sure?", "Discord", "Yes", "No") != "Yes")
if(tgui_alert(src, "This will open our Discord in your browser. Are you sure?", "Discord", list("Yes", "No"), 0) != "Yes")
return

DIRECT_OUTPUT(src, link(CONFIG_GET(string/discordurl)))


/client/verb/github()
set name = "github"
set hidden = TRUE
Expand All @@ -63,12 +59,11 @@
to_chat(src, span_warning("The bug tracker URL is not set in the server configuration."))
return

if(alert("This will open our bug tracker page in your browser. Are you sure?", "Github", "Yes", "No") != "Yes")
if(tgui_alert(src, "This will open our bug tracker page in your browser. Are you sure?", "Github", list("Yes", "No"), 0) != "Yes")
return

DIRECT_OUTPUT(src, link(CONFIG_GET(string/githuburl)))


/client/verb/webmap()
set name = "webmap"
set hidden = TRUE
Expand All @@ -79,7 +74,7 @@
return
var/map_url

var/choice = alert("Do you want to view the ground or the ship?",,"Ship","Ground","Cancel")
var/choice = tgui_alert(src, "Do you want to view the ground or the ship?", "Webmap", list("Ship", "Ground"), 0)
switch(choice)
if("Ship")
map_url = SSmapping.configs[SHIP_MAP].map_file
Expand Down
19 changes: 9 additions & 10 deletions interface/skin.dmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,16 @@ window "infowindow"
is-vert = false
elem "changelog"
type = BUTTON
pos = 6,5
size = 94x20
pos = 0,5
size = 90x20
anchor1 = 1,0
anchor2 = 16,0
saved-params = "is-checked"
text = "Changelog"
command = "changelog"
elem "discord"
type = BUTTON
pos = 100,5
pos = 90,5
size = 90x20
anchor1 = 16,0
anchor2 = 30,0
Expand All @@ -172,7 +172,7 @@ window "infowindow"
command = "discord"
elem "rules"
type = BUTTON
pos = 190,5
pos = 180,5
size = 90x20
anchor1 = 30,0
anchor2 = 44,0
Expand All @@ -181,7 +181,7 @@ window "infowindow"
command = "rules"
elem "wiki"
type = BUTTON
pos = 280,5
pos = 270,5
size = 90x20
anchor1 = 44,0
anchor2 = 58,0
Expand All @@ -190,7 +190,7 @@ window "infowindow"
command = "wiki"
elem "boosty"
type = BUTTON
pos = 370,5
pos = 360,5
size = 90x20
anchor1 = 58,0
anchor2 = 72,0
Expand All @@ -199,7 +199,7 @@ window "infowindow"
command = "boosty"
elem "github"
type = BUTTON
pos = 460,5
pos = 450,5
size = 90x20
anchor1 = 72,0
anchor2 = 86,0
Expand All @@ -208,15 +208,14 @@ window "infowindow"
command = "github"
elem "webmap"
type = BUTTON
pos = 550,5
size = 90x20
pos = 540,5
size = 95x20
anchor1 = 86,0
anchor2 = 100,0
saved-params = "is-checked"
text = "Webmap"
command = "webmap"


window "outputwindow"
elem "outputwindow"
type = MAIN
Expand Down
4 changes: 4 additions & 0 deletions tgui/packages/tgui-panel/themes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ export const setClientTheme = (name) => {
'github.text-color': '#000000',
'webmap.background-color': 'none',
'webmap.text-color': '#000000',
'boosty.background-color': 'none',
'boosty.text-color': '#000000',
// Status and verb tabs
'output.background-color': 'none',
'output.text-color': '#000000',
Expand Down Expand Up @@ -113,6 +115,8 @@ export const setClientTheme = (name) => {
'github.text-color': COLOR_DARK_TEXT,
'webmap.background-color': '#494949',
'webmap.text-color': COLOR_DARK_TEXT,
'boosty.background-color': '#494949',
'boosty.text-color': COLOR_DARK_TEXT,
// Status and verb tabs
'output.background-color': COLOR_DARK_BG_DARKER,
'output.text-color': COLOR_DARK_TEXT,
Expand Down
Loading