Skip to content
This repository has been archived by the owner on Jan 22, 2020. It is now read-only.

Commit

Permalink
Updating numerous mentions of Baystation 12 and their resources.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Feb 5, 2019
1 parent e3c00db commit 41f77fd
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
@@ -1,4 +1,4 @@
Baystation12 is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt.
Europa Station is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt.

Commits with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00) are licensed under the GNU General Public License version 3, which can be found in full in LICENSE-GPL3.txt.

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -50,4 +50,4 @@ Please check whatever applies. More checkboxes checked increase your chances of
- [ ] Issue could be reproduced by different players
- [ ] Issue could be reproduced in multiple rounds
- [ ] Issue happened in a recent (less than 7 days ago) round
- [ ] [Couldn't find an existing issue about this](https://github.com/Baystation12/Baystation12/issues)
- [ ] [Couldn't find an existing issue about this](https://github.com/Yonaguni/EuropaStation/issues)
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -40,4 +40,4 @@ Session.vim

# auto-generated tag files
tags
baystation12.code-workspace
europa.code-workspace
4 changes: 2 additions & 2 deletions COPYING
@@ -1,7 +1,7 @@
Baystation12
Copyright (C) 2010-2015 Baystation12 and tgstation13.
Copyright (C) 2010-2019 Europa Station, Baystation12 and tgstation13.

Baystation12 is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt.
Europa Station is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt.
Commits with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00) are licensed under the GNU General Public License version 3, which can be found in full in LICENSE-GPL3.txt.
All commits whose authorship dates are not prior to `1420675200 +0000` are assumed to be licensed under AGPL v3, if you wish to license under GPL v3 please make this clear in the commit message and any added files.

Expand Down
10 changes: 5 additions & 5 deletions README.md
@@ -1,11 +1,11 @@
# baystation12
# Europa Station

[Website](http://baystation12.net/) - [Code](http://github.com/Baystation12/Baystation12/) - [Discord](https://discord.gg/DrtRFxs) - [IRC](irc://irc.sorcery.net/#codershuttle)
[Website](http://europa.gn32.uk/) - [Code](http://github.com/Yonaguni/EuropaStation/)

---

### LICENSE
The code for Baystation12 is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in LICENSE-AGPL3.txt.
The code for Europa Station is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in LICENSE-AGPL3.txt.

Code with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00) is licensed under the GNU General Public License version 3, which can be found in full in LICENSE-GPL3.txt.

Expand All @@ -27,11 +27,11 @@ All assets including icons and sound are under a [Creative Commons 3.0 BY-SA lic
### GETTING THE CODE
The simplest way to obtain the code is using the github .zip feature.

Click [here](https://github.com/Baystation12/Baystation12/archive/dev.zip) to get the latest code as a .zip file, then unzip it to wherever you want.
Click [here](https://github.com/Yonaguni/EuropaStation/archive/master.zip) to get the latest code as a .zip file, then unzip it to wherever you want.

The more complicated and easier to update method is using git. You'll need to download git or some client from [here](http://git-scm.com/). When that's installed, right click in any folder and click on "Git Bash". When that opens, type in:

git clone https://github.com/Baystation12/Baystation12.git
git clone https://github.com/Yonaguni/EuropaStation.git

(hint: hold down ctrl and press insert to paste into git bash)

Expand Down
2 changes: 1 addition & 1 deletion code/game/world.dm
Expand Up @@ -560,7 +560,7 @@ var/world_topic_spam_protect_time = world.timeofday

s += "<b>[station_name()]</b>";
s += " ("
s += "<a href=\"https://forums.baystation12.net/\">" //Change this to wherever you want the hub to link to.
s += "<a href=\"http://europa.gn32.uk/\">" //Change this to wherever you want the hub to link to.
// s += "[game_version]"
s += "Forums" //Replace this with something else. Or ever better, delete it and uncomment the game version.
s += "</a>"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/new_player/login.dm
@@ -1,7 +1,7 @@
/var/obj/effect/lobby_image = new/obj/effect/lobby_image()

/obj/effect/lobby_image
name = "Baystation12"
name = "Europa Station"
desc = "This shouldn't be read."
screen_loc = "WEST,SOUTH"

Expand Down
13 changes: 4 additions & 9 deletions html/templates/header.html
Expand Up @@ -26,11 +26,8 @@
<div align='center'><font size='3'><b>Baystation 12</b></font></div>
<div align='center'><font size='3'><b><i>A Space Station 13 Project</i></b></font></div>

<p><div align='center'><font size='3'><a href="http://wiki.baystation12.net/">Wiki</a> | <a href="https://github.com/Baystation12/Baystation12/">Source code</a></font></div></p>
<p><div align='center'><font size='3'><a href="https://github.com/Yonaguni/EuropaStation/wiki">Wiki</a> | <a href="https://github.com/Yonaguni/EuropaStation/">Source code</a></font></div></p>
<font size='2'>Code licensed under <a href="http://www.gnu.org/licenses/agpl.html">AGPLv3</a>. Content licensed under <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a>.<br><br>
<font size='2'><b>Visit our IRC channels:</b> #bs12 and #codershuttle on irc.sorcery.net</font><br>
<font size='2'><b>Join our Discord server:</b> <a href='https://discord.gg/DrtRFxs'>-Click Here-</a><br></font>
<font size='2'><b>Support Baystation on Patreon:</b> <a href='https://www.patreon.com/bs12'>-Click Here-</a><br></font>
</td>
</tr>
</table>
Expand All @@ -39,11 +36,9 @@
<table align='center' class="top">
<tr>
<td valign='top'>
<font size='2'><b>Developers:</b> afterthought, chinsky, F-Tang Steve, mloc, PsiOmegaDelta, sabiram, xales<br></font>
<font size='2'><b>Currently Active GitHub contributor list:</b> <a href='https://github.com/Baystation12/Baystation12/graphs/contributors'>-Click Here-</a><br></font>
<p><font size='2'><b>Credits:</b> Abi79, Apple_Master, Arcalane, Aryn, Cael_Aislinn, Ccomp5950, chinsky, CompactNinja, Deus Dactyl, DopeGhoti, Erthilo, Flashkirby, Hawk_v3, Head, Ipsil, Invisty, JoeyJo0, Lexusjjss, Melonstorm, Miniature, mloc, NerdyBoy1104, PsiOmegaDelta, sabiram, Searif, SkyMarshal, Snapshot, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty, Xenone, cib, faux, Zuhayr<br></p>
<font size='2'><b>Special thanks to:</b> The developers of /tg/station, /vg/station, GoonStation, the original Space Station 13, and BYOND</font>
<div align='center'><font size='2' color='red'><b><br>Have a bug to report?</b> Visit our <a href="https://github.com/Baystation12/Baystation12/issues?labels=Bug&state=open">Issue Tracker</a>.<br></font></div>
<font size='2'><b>Currently Active GitHub contributor list:</b> <a href='https://github.com/Yonaguni/EuropaStation/graphs/contributors'>-Click Here-</a><br></font>
<font size='2'><b>Special thanks to:</b> The developers of Baystation 12, /tg/station, /vg/station, GoonStation, the original Space Station 13, and BYOND</font>
<div align='center'><font size='2' color='red'><b><br>Have a bug to report?</b> Visit our <a href="https://github.com/Yonaguni/EuropaStation/issues?labels=Bug&state=open">Issue Tracker</a>.<br></font></div>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion scripts/server.sh
@@ -1,6 +1,6 @@
#! /bin/bash

[[ -z $DME ]] && DME=baystation12 # DME file/BYOND project to compile and run
[[ -z $DME ]] && DME=europa # DME file/BYOND project to compile and run
[[ -z $PORT ]] && PORT=5000 # Port to run Dream Daemon on
[[ -z $GIT ]] && GIT=false # true, false, or any valid command; return value decides whether git is called to update the code
[[ -z $REPO ]] && REPO=upstream # Repo to fetch and pull from when updating
Expand Down
2 changes: 1 addition & 1 deletion tools/dmitool/merging.txt
Expand Up @@ -2,7 +2,7 @@
2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable (A guide for this can be found at https://www.java.com/en/download/help/path.xml ).

Merging
The easiest way to do merging is to install the merge driver. For this, open `Baystation12/.git/config` in a text editor, and paste the following lines to the end of it:
The easiest way to do merging is to install the merge driver. For this, open `EuropaStation/.git/config` in a text editor, and paste the following lines to the end of it:

[merge "merge-dmi"]
name = iconfile merge driver
Expand Down

0 comments on commit 41f77fd

Please sign in to comment.