Skip to content

Commit

Permalink
Merge pull request #1 from SPLURT-Station/splurtify
Browse files Browse the repository at this point in the history
Changes some references to point at SPLURT
  • Loading branch information
MosleyTheMalO authored Jun 9, 2024
2 parents ea98c98 + 23fcb49 commit e504dc8
Show file tree
Hide file tree
Showing 6 changed files with 279 additions and 40 deletions.
27 changes: 13 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
## Bubberstation (A Skyrat Downstream)
## SPLURT Station

[![CI Suite](https://github.com/Bubberstation/Bubberstation/actions/workflows/ci_suite.yml/badge.svg)](https://github.com/Bubberstation/Bubberstation/actions/workflows/ci_suite.yml)
[![CI Suite](https://github.com/SPLURT-Station/S.P.L.U.R.T-tg/actions/workflows/ci_suite.yml/badge.svg)](https://github.com/SPLURT-Station/S.P.L.U.R.T-tg/actions/workflows/ci_suite.yml)

[![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)

| Website | Link |
|---------------------------|------------------------------------------------|
| Git / GitHub cheatsheet | [https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833](https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833) |
| Guide to Modularization | [./modular_skyrat/readme.md](./modular_skyrat/readme.md) |
| Website | [https://wiki.bubberstation.org/index.php?title=Main_Page](https://wiki.bubberstation.org/index.php?title=Main_Page) |
| Code | [https://github.com/Bubberstation/Bubberstation](https://github.com/Bubberstation/Bubberstation) |
| Wiki | [https://tgstation13.org/wiki/Main_Page](https://tgstation13.org/wiki/Main_Page) |
| Website | [https://splurtstation.com](https://splurtstation.com) |
| Code | [https://github.com/SPLURT-Station/S.P.L.U.R.T-tg](https://github.com/SPLURT-Station/S.P.L.U.R.T-tg) |
| Wiki | [https://splurtstation.com](https://splurtstation.com) |
| Codedocs | [https://skyrat-ss13.github.io/Skyrat-tg/](https://skyrat-ss13.github.io/Skyrat-tg/) |
| Bubberstation Discord | [https://discord.gg/x4CVEHy6u7](https://discord.gg/x4CVEHy6u7) |
| Coderbus Discord | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9) |
| S.P.L.U.R.T Station Discord | [https://discord.gg/wynHVMzHzC](https://discord.gg/wynHVMzHzC) |

This is Bubberstation's downstream fork of Skyrat, which is in turn a fork of tgstation.
This is S.P.L.U.R.T Station's downstream fork of bubberstation, which is in turn a fork of skyrat, which is in turn a fork of tgstation.

**Please note that this repository contains sexually explicit content and is not suitable for those under the age of 18.**

Expand All @@ -24,23 +23,23 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
## Contribution Rules and Guidelines

**1. Do Not Be A Dick**
- The Bubberstation main repository is run by and contributed by volunteers. You are not entitled to our time and energy. We reserve the right to permanently remove anyone who does not show both our contributor's and maintainer's common decency.
- The S.P.L.U.R.T. main repository is run by and contributed by volunteers. You are not entitled to our time and energy. We reserve the right to permanently remove anyone who does not show both our contributor's and maintainer's common decency.

**2. This repository will only accept feedback that has to do with the functionality of code, sound, and images**
- To maintain a proper working space for our contributors and to keep the repository free of clutter. All feedback that does not have to do with the functionality, quality, and review of code will be marked off-topic.
- If you feel like feedback on a controversial PR is required, you are free to open a [feature request](https://github.com/Bubberstation/Bubberstation/issues/new/choose) under the repository issues page and reference the PR number.
- If you feel like feedback on a controversial PR is required, you are free to open a [feature request](https://github.com/SPLURT-Station/S.P.L.U.R.T-tg/issues/new/choose) under the repository issues page and reference the PR number.

**3. The Licensing is Non-negotiable**
- You are free to take, redistribute, modify, and readapt any code or commit found on this repository.
- All code files are under **GNU AGPL V3**
- You are free to take, redistribute, modify, and readapt any code or commit found on this repository.
- All code files are under **GNU AGPL V3**
- All asset files (images and sound) are **CC-BY-SA 3.0** unless otherwise stated
- The license information, including the MIT license and its exceptions, can be found at the bottom of this readme.
- The license information, including the MIT license and its exceptions, can be found at the bottom of this readme.
- What does this mean to our contributors? **The** [GNU AGPL V3](https://www.gnu.org/licenses/agpl-3.0.html) **licensing on this codebase is non-negotiable** and **irrevocable** the moment you open a PR. We are incapable of privatizing this codebase and you are incapable of restricting your code contributions even if you close the PR. Do not open a contribution if you do not feel comfortable with your code being permanent across the entirety of the community. **All contributions are preserved in commit history**
- What does this mean to our spriters and sound designers? [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) **is the only license that this project will accept**
- It is prohibited to use the attribution requirement to [suggest that you endorse or support a particular use](https://creativecommons.org/faq/#do-i-need-to-be-aware-of-anything-else-when-providing-attribution) of your assets.
- You are entitled to credit yourself with comments and you are entitled to waive the attribution requirement choosing not to be identified as the creator if you wish.
- If you do not like how your assets were modified or used, it is required that the other person [remove the attribution information upon request](https://wiki.creativecommons.org/wiki/License_Versions#Licensors_may_request_removal_of_attribution).
- Modifications or adaptions must disclose the source, the author, and [any changes you've made](https://wiki.creativecommons.org/wiki/License_Versions#Modifications_and_adaptations_must_be_indicated).
- Modifications or adaptions must disclose the source, the author, and [any changes you've made](https://wiki.creativecommons.org/wiki/License_Versions#Modifications_and_adaptations_must_be_indicated).
- Goonstation code is incompatible with this codebase and will not be accepted.

*Credit: [Goonstation contribution guidelines](https://hackmd.io/@goonstation/docs/%2F%40goonstation%2Fcontribute#What-if-I-change-my-mind-about-my-contributions-being-published)*
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/moonstation/moonstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -62181,7 +62181,7 @@
/obj/effect/turf_decal/sand/plating,
/obj/machinery/nuclearbomb/beer{
flood_reagent = /datum/reagent/lube;
name = "\improper Bubberstation-brand nuclear fission explosive";
name = "\improper SPLURT-brand nuclear fission explosive";
desc = "Mom found the lube nuke."
},
/turf/open/floor/plating/rust/moonstation,
Expand Down
240 changes: 240 additions & 0 deletions config/splurt/splurt_title.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
<html>
<head>
<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: "Fixedsys";
src: url("FixedsysExcelsior3.01Regular.ttf");
}
body,
html {
margin: 0;
overflow: hidden;
text-align: center;
background-color: black;
padding-top: 5vmin;
-ms-user-select: none;
cursor: default;
}

img {
border-style:none;
}

.bg {
position: absolute;
width: auto;
height: 100vmin;
min-width: 100vmin;
min-height: 100vmin;
top: 50%;
left:50%;
transform: translate(-50%, -50%);
z-index: 0;
}

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

.terminal_text {
display: inline-block;
font-weight: lighter;
text-decoration: none;
width: 100%;
text-align: right;
color:green;
text-shadow: 1px 1px black;
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;
padding: 4px;
background-color: black;
}

.progress_bar {
width: 0%;
height: 100%;
background-color: green;
}

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

.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;
}

.container_nav {
position: absolute;
box-sizing: border-box;
width: 90vmin;
min-height: 10vmin;
top: calc(50% + 22.5vmin);
left:50%;
transform: translate(-50%, -50%);
z-index: 1;
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));
opacity: 75%;
padding: 1em;
}

.container_nav hr {
height: 2px;
background-color: #cde;
border: none;
box-shadow: 2px 2px black;
}

.menu_button {
display: block;
box-sizing: border-box;
font-family: "Fixedsys";
font-weight: lighter;
text-decoration: none;
font-size: 4vmin;
text-shadow: 2px 2px black;
line-height: 4vmin;
width: 100%;
text-align: left;
color: #cde;
height: 4vmin;
padding-left: 5vmin;
letter-spacing: 1px;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
}

.menu_button:hover {
padding-left: 0px;
color: yellow;
}

.menu_button:active {
padding-left: 0px;
transform: translate(2px, 2px);
}

.menu_button:hover::before {
content: "☞";
text-align: center;
width: 5vmin;
display: inline-block;
}

@keyframes pulse_button {
0% {transform: translateX(0px);}
100% {transform: translateX(2px);}
}

.menu_button:active::before {
content: "☛";
text-align: center;
width: 5vmin;
animation: pulse_button 0.25s infinite alternate;
}

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

.menu_newpoll {
animation: pollsbox 2s step-start infinite;
padding-left: 0px;
}

.menu_newpoll::before {
content: "→";
text-align: center;
width: 5vmin;
display: inline-block;
}

.menu_newpoll::after {
content: "←";
text-align: center;
width: 5vmin;
display: inline-block;
}

.container_notice {
position: absolute;
box-sizing: border-box;
width: auto;
padding-top: 1vmin;
top: calc(50% - 10vmin);
left:50%;
transform: translate(-50%, -50%);
z-index: 1;
}

.menu_notice {
display: inline-block;
font-family: "Fixedsys";
font-weight: lighter;
text-decoration: none;
width: 100%;
text-align: left;
color: red;
text-shadow: 1px 0px black, -1px 0px black, 0px 1px black, 0px -1px black, 2px 0px black, -2px 0px black, 0px 2px black, 0px -2px black;
margin-right: 0%;
margin-top: 0px;
font-size: 3vmin;
line-height: 2vmin;
}

.unchecked {
color: #F44;
}

.checked {
color: #4F4;
}
</style>
</head>
<body>
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ SUBSYSTEM_DEF(title)

/datum/controller/subsystem/title/Initialize()
var/dat
if(!fexists("[global.config.directory]/bubbers/bubbers_title.txt")) // BUBBER EDIT - original title_html.txt
to_chat(world, span_boldwarning("CRITICAL ERROR: Unable to read bubbers_title.txt, reverting to backup title html, please check your server config and ensure this file exists.")) // BUBBER EDIT - original title_html.txt
if(!fexists("[global.config.directory]/splurt/splurt_title.txt")) // BUBBER EDIT - original title_html.txt
to_chat(world, span_boldwarning("CRITICAL ERROR: Unable to read splurt_title.txt, reverting to backup title html, please check your server config and ensure this file exists.")) // BUBBER EDIT - original title_html.txt
dat = DEFAULT_TITLE_HTML
else
dat = file2text("[global.config.directory]/bubbers/bubbers_title.txt") // BUBBER EDIT - original title_html.txt
dat = file2text("[global.config.directory]/splurt/splurt_title.txt") // BUBBER EDIT - original title_html.txt

title_html = dat

Expand Down
Loading

0 comments on commit e504dc8

Please sign in to comment.