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

[UI] Splurt-Themed UI Update and Server Adjustments #60

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+44 −45
Draft

[UI] Splurt-Themed UI Update and Server Adjustments #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c9f0d8
Splurt-Themed UI Update and Server Adjustments
Phoenix4O4 Dec 26, 2024
4aea3be
added splurt_title_screen
Phoenix4O4 Dec 26, 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
81 changes: 38 additions & 43 deletions config/splurt/splurt_title.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type='text/css'>
@font-face {
font-family: "Ubuntu";
font-style: normal;
font-weight: 500;
font-display: block;
src: url("Ubuntu-Medium.ttf");
}
@font-face {
font-family: "Fixedsys";
src: url("FixedsysExcelsior3.01Regular.ttf");
Expand All @@ -11,8 +18,9 @@
html {
margin: 0;
overflow: hidden;
font-family: "Fixedsys";
text-align: center;
background-color: black;
background-color: #000000;
padding-top: 5vmin;
-ms-user-select: none;
cursor: default;
Expand All @@ -36,73 +44,60 @@

.container_terminal {
position: absolute;
width: 100%;
height: calc(100% - 7vmin);
top: calc(90% - 3vmin);
left: calc(50% - 450px);
height: 3vmin;
width: 900px;
overflow: clip;
box-sizing: border-box;
padding: 3vmin 2vmin;
top: 0%;
left:0%;
z-index: 1;
}

.terminal_text {
font-family: "Ubuntu";
font-weight: 500;
src: url("Ubuntu-Medium.ttf");
display: inline-block;
font-weight: lighter;
text-decoration: none;
width: 100%;
text-align: right;
color:green;
text-shadow: 1px 1px black;
text-align: left;
color:#00FF99;
margin-right: 0%;
margin-top: 0px;
font-size: 2vmin;
line-height: 1vmin;
letter-spacing: 1px;
}

.container_progress {
position: absolute;
box-sizing: border-box;
bottom: 3vmin;
left: 2vmin;
height: 4vmin;
width: calc(100% - 4vmin);
border-left: 2px solid green;
border-right: 2px solid green;
top: 90%;
left: calc(50% - 450px);
height: 72px;
width: 900px;
border-top: 4px solid #00FF99;
border-bottom: 4px solid #00FF99;
border-left: 4px solid #00FF99;
border-right: 4px solid #00FF99;
padding: 4px;
background-color: black;
background-color: #000000;
}

.progress_bar {
width: 0%;
height: 100%;
background-color: green;
background-image: url("https://i.ibb.co/X3XrjHn/splurt-prog-900px.gif");
background-position: center right;
background-color: #000000;
}

@keyframes looping_sub_pattern {
from {
background-position: 0px 0px;
}
@keyframes fade_out {
to {
background-position: 11.3137px 0px;
opacity: 0;
}
}

.sub_progress_bar {
width: 0%;
height: 100%;
float: right;
background-color: lime;
background-image: repeating-linear-gradient(
-45deg,
green,
green 7px,
black 7px,
black 8px
);
background-attachment: fixed;
animation: looping_sub_pattern 1s linear infinite;
.fade_out {
animation: fade_out 2s both;
}

.container_nav {
Expand All @@ -117,14 +112,14 @@
border: 2px solid white;
border-radius: 4px;
box-shadow: 2px 2px #333, inset 1px 1px #333;
background: linear-gradient(to bottom, rgba(68, 68, 204, 0.9), rgba(0, 0, 102, 0.9));
background: linear-gradient(to bottom, rgba(0, 179, 107, 0.9), rgba(0, 56, 34, 0.9));
opacity: 75%;
padding: 1em;
}

.container_nav hr {
height: 2px;
background-color: #cde;
background-color: #CDEEE1;
border: none;
box-shadow: 2px 2px black;
}
Expand All @@ -140,7 +135,7 @@
line-height: 4vmin;
width: 100%;
text-align: left;
color: #cde;
color: #CDEEE1;
height: 4vmin;
padding-left: 5vmin;
letter-spacing: 1px;
Expand Down Expand Up @@ -179,7 +174,7 @@
}

@keyframes pollsbox {
0% {color: #cde;}
0% {color: #CDEEE1;}
50% {color: #f80;}
}

Expand Down
2 changes: 1 addition & 1 deletion interface/skin.dmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ window "mainwindow"
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
statusbar = false
icon = 'modular_zubbers\\icons\\UI_Icons\\common\\bubber_32.png'
icon = 'modular_zzplurt\\icons\\UI_Icons\\common\\splurt_64.png'
macro = "default"
menu = "menu"
elem "split"
Expand Down
2 changes: 1 addition & 1 deletion modular_skyrat/modules/title_screen/code/_title_screen_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define DEFAULT_TITLE_MAP_LOADTIME (150 SECONDS)

#define DEFAULT_TITLE_SCREEN_IMAGE 'modular_skyrat/modules/title_screen/icons/skyrat_title_screen.png'
#define DEFAULT_TITLE_SCREEN_IMAGE 'modular_zzplurt/icons/UI_Icons/title_screen/splurt_title_screen.png' // SPLURT EDIT START: TITLE SCREEN - old value: 'modular_skyrat/modules/title_screen/icons/skyrat_title_screen.png'
#define DEFAULT_TITLE_LOADING_SCREEN 'modular_skyrat/modules/title_screen/icons/loading_screen.gif'

#define TITLE_PROGRESS_CACHE_FILE "data/progress_cache.json"
Expand Down
4 changes: 4 additions & 0 deletions modular_zubbers/code/__DEFINES/send2relay.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@

/client/verb/go2relay()
var/list/static/relays = list(
// SPLURT EDIT START: NO RELAY
/*
US_EAST_RELAY,
US_WEST_RELAY,
SYDNEY_RELAY,
EU_RELAY,
NO_RELAY,
*/
// SPLURT EDIT END: NO RELAY
)
var/choice = tgui_input_list(usr, "Which relay do you wish to use?", "Relay Select", relays)
var/destination
Expand Down
Binary file added modular_zzplurt/icons/UI_Icons/common/splurt_32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modular_zzplurt/icons/UI_Icons/common/splurt_64.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modular_zzplurt/icons/UI_Icons/title_screen/splurt_title_screen.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading