Skip to content
This repository has been archived by the owner on Sep 12, 2021. It is now read-only.

Commit

Permalink
Whitesands Regex/Replacements (#708)
Browse files Browse the repository at this point in the history
I sure bloody hope this doesn't break anything

* clustertruck

* whoops

* a few more changes

* fixes errors

* final adjustments
  • Loading branch information
MarkSuckerberg authored Jan 25, 2021
1 parent 2e88767 commit dd44b4b
Show file tree
Hide file tree
Showing 871 changed files with 2,149 additions and 2,155 deletions.
4 changes: 2 additions & 2 deletions .github/AUTODOC_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# dmdoc
[DOCUMENTATION]: https://waspstation.github.io/WaspStation-1.0/
[DOCUMENTATION]: https://whitesands13.github.io/Whitesands/

[BYOND]: https://secure.byond.com/

Expand Down Expand Up @@ -89,7 +89,7 @@ that will also be rendered and added to the modules tree. The structure for
these is deliberately not defined, so you can be as freeform and as wheeling as
you would like.

[Here is a representative example of what you might write](https://waspstation.github.io/WaspStation-1.0/code/modules/keybindings/readme.html)
[Here is a representative example of what you might write](https://whitesands13.github.io/Whitesands/code/modules/keybindings/readme.html)

## Special variables
You can use certain special template variables in DM DOC comments and they will be expanded
Expand Down
17 changes: 7 additions & 10 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,22 @@
# to the same file or dir, add them to the end under Multiple Owners

# BFAT
/code/modules/power/generator.dm @SynnGraffkin
/waspstation/code/modules/mapping/minimaps.dm @SynnGraffkin
/whitesands/code/modules/mapping/minimaps.dm @SynnGraffkin
/whitesands/code/modules/spacepods/ @SynnGraffkin

# Marksuckerberg
/waspstation/code/modules/admin/ @MarkSuckerberg
/waspstation/code/modules/antagonists/borer/ @MarkSuckerberg
/waspstation/code/modules/jobs/ @MarkSuckerberg
/waspstation/code/modules/reagents/ @MarkSuckerberg
/waspstation/code/modules/surgery/ @MarkSuckerberg
/waspstation/code/modules/overmap @MarkSuckerberg
/whitesands/code/modules/antagonists/borer/ @MarkSuckerberg
/whitesands/code/modules/jobs/ @MarkSuckerberg
/whitesands/code/modules/overmap/ @MarkSuckerberg

# Maldaris
/waspstation/code/modules/mob/living/carbon/human/species_types/spider.dm @Maldaris
/whitesands/code/modules/mob/living/carbon/human/species_types/spider.dm @Maldaris

# Superyodeler
/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @Superyodeler

# triplezeta
/waspstation/icons/ @triplezeta
/whitesands/icons/ @triplezeta

##### /TG BEGIN #####

Expand Down
12 changes: 6 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ If you have difficulty, ask for help in the #coding-general channel on our disco

## Introduction

Hello and welcome to WaspStation's contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at wasp, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code.
Hello and welcome to White Sands' contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at WS, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code.

First things first, we want to make it clear how you can contribute (if you've never contributed before), as well as the kinds of powers the team has over your additions, to avoid any unpleasant surprises if your pull request is closed for a reason you didn't foresee.

## Getting Started

WaspStation doesn't have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure.
White Sands doesn't usually have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure.

If you want to contribute the first thing you'll need to do is [set up Git](https://wiki.boomerstation.space/Setting_up_git) so you can download the source code.
If you want to contribute the first thing you'll need to do is [set up Git](https://wiki.white-sands.space/Setting_up_git) so you can download the source code.
After setting it up, optionally navigate your git commandline to the project folder and run the command: 'git config blame.ignoreRevsFile .git-blame-ignore-revs'

We have a [list of guides on the wiki](https://wiki.boomerstation.space/index.php/Guides#Development_and_Contribution_Guides) that will help you get started contributing to WaspStation with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources).
We have a [list of guides on the wiki](https://wiki.white-sands.space/index.php/Guides#Development_and_Contribution_Guides) that will help you get started contributing to White Sands with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources).

There is an open list of approachable issues for [your inspiration here](https://github.com/waspstation/waspstation-1.0/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22).e
There is an open list of approachable issues for [your inspiration here](https://github.com/Whitesands13/Whitesands/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22).e

You can of course, as always, ask for help on the discord channels, or the forums, We're just here to have fun and help out, so please don't expect professional support.

Expand Down Expand Up @@ -393,7 +393,7 @@ There is no strict process when it comes to merging pull requests. Pull requests

* You are going to be expected to document all your changes in the pull request. Failing to do so will mean delaying it as we will have to question why you made the change. On the other hand, you can speed up the process by making the pull request readable and easy to understand, with diagrams or before/after data.

* We ask that you use the changelog system to document your change, which prevents our players from being caught unaware by changes - you can find more information about this [on this wiki page](https://wiki.boomerstation.space/Guide_to_Changelogs).
* We ask that you use the changelog system to document your change, which prevents our players from being caught unaware by changes - you can find more information about this [on this wiki page](https://wiki.white-sands.space/Guide_to_Changelogs).

* If you are proposing multiple changes, which change many different aspects of the code, you are expected to section them off into different pull requests in order to make it easier to review them and to deny/accept the changes that are deemed acceptable. (This is called atomization, if someone asks you to do it.)

Expand Down
11 changes: 4 additions & 7 deletions .github/DOWNLOADING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# DOWNLOADING
There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at https://wiki.boomerstation.space/Downloading_the_source_code
There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at https://wiki.white-sands.space/Downloading_the_source_code

## Option 1

Follow this: https://wiki.boomerstation.space/Setting_up_git
Follow this: https://wiki.white-sands.space/Setting_up_git

## Option 2

Expand All @@ -12,19 +12,16 @@ code tab of https://github.com/tgstation/tgstation
(note: this will use a lot of bandwidth if you wish to update and is a lot of
hassle if you want to make any changes at all, so it's not recommended.)

**WARNING: OPTIONS 3 AND 4 ARE NOT AVAILABLE FOR WASPCODE, THESE ARE FOR /TG/ ONLY AS OF NOW**
**WARNING: OPTIONS 3 IS NOT AVAILABLE FOR WSCODE, THIS IS FOR /TG/ ONLY AS OF NOW**

## Option 3

Download a pre-compiled nightly at https://tgstation13.download/nightlies/ (same caveats as option 2)

*Warning: option 4 is out of date, and not maintained, use at your own risk*

## Option 4

Use our docker image that tracks the master branch (See commits for build status. Again, same caveats as option 2)

```
docker run -d -p <your port>:1337 -v /path/to/your/config:/tgstation/config -v /path/to/your/data:/tgstation/data tgstation/tgstation <dream daemon options i.e. -public or -params>
docker run -d -p <your port>:1337 -v /path/to/your/config:/tgstation/config -v /path/to/your/data:/tgstation/data whitesands13/whitesands <dream daemon options i.e. -public or -params>
```

4 changes: 2 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: waspstation
patreon: whitesands
open_collective: # Replace with a single Open Collective username
ko_fi: mantisstation
ko_fi: # mantisstation
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
Expand Down
14 changes: 7 additions & 7 deletions .github/MAPS_AND_AWAY_MISSIONS.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# MAPS

Waspstation currently comes equipped with five maps.
White Sands currently comes equipped with five maps.

* [BoxStation (default)](https://wiki.boomerstation.space/Boxstation)
* [MetaStation](https://wiki.boomerstation.space/MetaStation)
* [DeltaStation](https://wiki.boomerstation.space/DeltaStation)
* [PubbyStation](https://wiki.boomerstation.space/PubbyStation)
* [Kilostation](https://wiki.boomerstation.space/KiloStation)
* [BoxStation (default)](https://wiki.white-sands.space/Boxstation)
* [MetaStation](https://wiki.white-sands.space/MetaStation)
* [DeltaStation](https://wiki.white-sands.space/DeltaStation)
* [PubbyStation](https://wiki.white-sands.space/PubbyStation)
* [Kilostation](https://wiki.white-sands.space/KiloStation)

All maps have their own code file that is in the base of the _maps directory. Maps are loaded dynamically when the game starts. Follow this guideline when adding your own map, to your fork, for easy compatibility.

Expand All @@ -18,7 +18,7 @@ Anytime you want to make changes to a map it's imperative you use the [Map Mergi

## AWAY MISSIONS

Waspstation supports loading away missions however they are disabled by default.
White Sands supports loading away missions however they are disabled by default.

Map files for away missions are located in the _maps/RandomZLevels directory. Each away mission includes it's own code definitions located in /code/modules/awaymissions/mission_code. These files must be included and compiled with the server beforehand otherwise the server will crash upon trying to load away missions that lack their code.

Expand Down
4 changes: 2 additions & 2 deletions .github/RUNNING_A_SERVER.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ https://github.com/tgstation/tgstation-server

## SQL SETUP

The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes. More detailed setup instructions are located here: https://wiki.boomerstation.space/Downloading_the_source_code#Setting_up_the_database
The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes. More detailed setup instructions are located here: https://wiki.white-sands.space/Downloading_the_source_code#Setting_up_the_database

If you are hosting a testing server on windows you can use a standalone version of MariaDB pre load with a blank (but initialized) tgdb database. Find them here: https://tgstation13.download/database/ Just unzip and run for a working (but insecure) database server. Includes a zipped copy of the data folder for easy resetting back to square one.

Expand All @@ -77,7 +77,7 @@ Web delivery of game resources makes it quicker for players to join and reduces

1. Edit compile_options.dm to set the `PRELOAD_RSC` define to `0`
1. Add a url to config/external_rsc_urls pointing to a .zip file containing the .rsc.
* If you keep up to date with Wasp you could reuse Wasp's rsc cdn at https://cdn.boomerstation.space/rsc/tgstation.rsc. Otherwise you can use cdn services like CDN77 or cloudflare (requires adding a page rule to enable caching of the zip), or roll your own cdn using route 53 and vps providers.
* If you keep up to date with White Sands you could reuse White Sands' rsc cdn at https://cdn.white-sands.space/rsc/tgstation.rsc. Otherwise you can use cdn services like CDN77 or cloudflare (requires adding a page rule to enable caching of the zip), or roll your own cdn using route 53 and vps providers.
* Regardless even offloading the rsc to a website without a CDN will be a massive improvement over the in game system for transferring files.

## IRC BOT SETUP
Expand Down
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Admin:
- 'code/modules/admin/**'
- 'waspstation/code/modules/admin/**'
- 'whitesands/code/modules/admin/**'

# Any file within the config subfolder
Config:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compile_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
- name: Commit
if: steps.value_holder.outputs.CL_ENABLED
run: |
git config --local user.email "60119942+WaspStation[email protected]"
git config --local user.name "WaspStation-Bot"
git config --local user.email "60119942+Whitesands[email protected]"
git config --local user.name "Whitesands-Bot"
git pull origin master
git commit -m "Automatic changelog compile [ci skip]" -a || true
- name: "Push"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Build and Publish Docker Image to Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: waspstation/waspstation
name: whitesands13/whitesands
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
dockerfile: Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
run: |
~/dmdoc
touch dmdoc/.nojekyll
echo waspstation.github.io > dmdoc/CNAME
echo whitesands.github.io > dmdoc/CNAME
- name: Deploy
uses: JamesIves/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/make_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ jobs:
env:
#GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} Use this instead if you have unprotected branches
GITHUB_TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
GIT_EMAIL: "60119942+WaspStation[email protected]"
GIT_NAME: "WaspStation-Bot"
GIT_EMAIL: "60119942+Whitesands[email protected]"
GIT_NAME: "Whitesands-Bot"
run: python tools/changelog/generate_cl.py
4 changes: 2 additions & 2 deletions .github/workflows/update_tgs_dmapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:

- name: Commit and Push
run: |
git config user.name WaspStation-Bot
git config user.email 60119942+WaspStation[email protected]
git config user.name Whitesands-Bot
git config user.email 60119942+Whitesands[email protected]
git add .
git commit -m 'Update TGS DMAPI'
git push -f -u origin tgs-dmapi-update
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# WaspStation 13 Codebase
# White Sands 13 Codebase

![Checks](https://github.com/WaspStation/WaspStation-1.0/workflows/Checks/badge.svg) [![Percentage of issues still open](http://isitmaintained.com/badge/open/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/waspstation/waspstation-1.0 "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/waspstation/waspstation-1.0 "Average time to resolve an issue") [![GitHub issues](https://img.shields.io/github/issues/waspstation/waspstation-1.0)](https://github.com/waspstation/waspstation-1.0/issues) ![GitHub top language](https://img.shields.io/github/languages/top/waspstation/waspstation-1.0)
![Checks](https://github.com/Whitesands13/Whitesands/workflows/Checks/badge.svg) [![Percentage of issues still open](http://isitmaintained.com/badge/open/whitesands13/whitesands.svg)](https://isitmaintained.com/project/whitesands13/whitesands "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/whitesands13/whitesands.svg)](https://isitmaintained.com/project/whitesands13/whitesands "Average time to resolve an issue") [![GitHub issues](https://img.shields.io/github/issues/whitesands13/whitesands)](https://github.com/Whitesands13/Whitesands/issues) ![GitHub top language](https://img.shields.io/github/languages/top/whitesands13/whitesands)

[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)

* **Website:** TBA
* **Code:** <https://github.com/WaspStation/WaspStation-1.0>
* **Code:** <https://github.com/Whitesands13/Whitesands>
* **Mantis Discord:** <https://discord.gg/husVWe8>
* **Boomer Discord:** <https://discord.gg/BUM8uRc>
* **Coderbus Discord:** <https://discord.gg/Vh8TJp9>
Expand Down Expand Up @@ -57,4 +57,4 @@ See the footer of [code/__DEFINES/tgs.dm](./code/__DEFINES/tgs.dm) and [code/mod

All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.

All assets located in the `goon` and `waspstation/goon` directory are under a [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/). Assets created by Goonstation.
All assets located in the `goon` and `whitesands/goon` directory are under a [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/). Assets created by Goonstation.
2 changes: 1 addition & 1 deletion code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
#define NOHUSK 22 // Can't be husked.
#define ROBOTIC_LIMBS 23 //limbs start out as robotic; but also use organic icons. If you want to use the default ones, you'll have to use on_species_gain
#define NOMOUTH 24
#define NO_BONES 25 //WaspStation Edit - Breakable Bones
#define NO_BONES 25 //WS Edit - Breakable Bones

//organ slots
#define ORGAN_SLOT_BRAIN "brain"
Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
#define ACCESS_PHARMACY 69 ///Nice.
#define ACCESS_PSYCHOLOGY 70

//WaspStation Begin
//WS Begin
/// Cloning room and clone pod ejection
#define ACCESS_CLONING 68
/// SGR Office
#define ACCESS_SOLGOV 90 //Let's give em plenty of room, now
//WaspStation End
//WS End


//BEGIN CENTCOM ACCESS
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
#define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
#define ADMIN_PUNISHMENT_MAZING "Puzzle"
#define ADMIN_PUNISHMENT_IMMERSE "Fully Immerse"
#define ADMIN_PUNISHMENT_NYA "Neko"//WaspStation Edit - Admin Punishment: Cat Tongue
#define ADMIN_PUNISHMENT_NYA "Neko"//WS Edit - Admin Punishment: Cat Tongue

#define AHELP_ACTIVE 1
#define AHELP_CLOSED 2
Expand Down
Loading

0 comments on commit dd44b4b

Please sign in to comment.