Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit b77dfd6

Browse files
swissloafswissloaf
authored
Merge pull request #5 from yogstation13/master
asd
2 parents 7f21eae + 8b5075b commit b77dfd6

2,135 files changed

Lines changed: 329419 additions & 246983 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
/code/controllers/failsafe.dm @AsV9
2424
/code/controllers/subsystem.dm @AsV9
2525
/code/controllers/subsystem/timer.dm @AsV9
26-
/code/datums/achievements/achievements.dm @AsV9
2726

2827
#Ktlwjec
2928
/_maps/ @Ktlwjec1

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ You can type "Fixes issue #6" and issue 6 will be automatically closed when your
88

99
Edit the changelog at the bottom for changes that are noticeable by the players. Remove it if this isn't the case.
1010
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.
11-
Include [admin] in the title if it's something admin related.
12-
Include [s] in the title if you don't want it to be announced on discord and the server.
11+
Prefix the PR title with [admin] if it's something admin related.
12+
Prefix the PR title with [s] if you are fixing an exploit so it is not announced on discord and the server.
1313

1414
#### Changelog
1515

‎.github/labeler.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
Admin:
2+
- 'code/modules/admin/**'
3+
4+
# Any file within the config subfolder
5+
Config:
6+
- 'config/**'
7+
8+
Dependencies:
9+
- '**/package.json'
10+
- '**/package-lock.json'
11+
- '**/yarn.lock'
12+
13+
# When the .DME is changed
14+
DME Edit:
15+
- './*.dme'
16+
- '**/*.dme'
17+
18+
# Any .dmi changes
19+
Sprites:
20+
- '**/*.dmi'
21+
22+
# Javascript changes
23+
Javascript:
24+
- '**/*.js'
25+
26+
# Changes to a .dmm
27+
Map Change:
28+
- '**/*.dmm'
29+
30+
# Any changes to .ogg files are marked as sound
31+
Sound:
32+
- '**/*.ogg'
33+
34+
# Changes to the SQL subfolder
35+
SQL:
36+
- 'SQL/**'
37+
38+
# Encompasses both the tgui and the tgui-next folder
39+
tgui:
40+
- 'tgui/**'
41+
- 'tgui-next/**'
42+
43+
# Changes to the .Github folder
44+
Github:
45+
- '.github/**'

‎.github/sources.list‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#------------------------------------------------------------------------------#
2+
# OFFICIAL UBUNTU REPOS #
3+
#------------------------------------------------------------------------------#
4+
5+
6+
###### Ubuntu Main Repos
7+
deb http://us.archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse
8+
deb-src http://us.archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse
9+
10+
###### Ubuntu Update Repos
11+
deb http://us.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
12+
deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
13+
deb http://us.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
14+
deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
15+
deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
16+
deb-src http://us.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse

‎.github/workflows/labeler.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: PR Labeler
2+
on:
3+
schedule:
4+
- cron: '*/5 * * * *'
5+
jobs:
6+
labeler:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: paulfantom/periodic-labeler@master
10+
env:
11+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
GITHUB_REPOSITORY: ${{ github.repository }}
13+
LABEL_MAPPINGS_FILE: .github/labeler.yml

‎.github/workflows/turdis.yml‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Turdis
4+
5+
# Controls when the action will run. Triggers the workflow on push or pull request
6+
# events but only for the master branch
7+
on:
8+
pull_request:
9+
branches: master
10+
push:
11+
branches: master
12+
13+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
14+
jobs:
15+
lint:
16+
name: Lints
17+
runs-on: ubuntu-18.04
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- name: Cache SpacemanDMM
22+
uses: actions/cache@v1
23+
with:
24+
path: ~/SpacemanDMM
25+
key: ${{ runner.os }}-dreamchecker-${{ hashFiles('dependencies.sh')}}
26+
restore-keys: ${{ runner.os }}-dreamchecker
27+
28+
- name: Setup Python
29+
uses: actions/setup-python@v1.2.0
30+
31+
- name: Setup Rust
32+
uses: hecrj/setup-rust-action@v1.3.2
33+
with:
34+
default: true
35+
36+
- name: Setup PHP
37+
uses: nanasess/setup-php@v3.0.3
38+
with:
39+
php_version: 5.6
40+
41+
- name: Install Dependencies
42+
run: |
43+
wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
44+
tools/travis/install_build_tools.sh
45+
tools/travis/install_spaceman_dmm.sh dreamchecker
46+
47+
- name: Misc Checks
48+
run: |
49+
tools/travis/check_filedirs.sh yogstation.dme
50+
tools/travis/check_changelogs.sh
51+
find . -name "*.php" -print0 | xargs -0 -n1 php -l
52+
find . -name "*.json" -not -path "./tgui/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
53+
tools/travis/build_tgui.sh
54+
tools/travis/check_grep.sh
55+
56+
- name: Run Linter
57+
run: ~/dreamchecker
58+
compile:
59+
name: Compile All Maps
60+
runs-on: ubuntu-18.04
61+
steps:
62+
- uses: actions/checkout@v2
63+
64+
- name: Install Dependencies
65+
run: |
66+
curl https://raw.githubusercontent.com/yogstation13/Yogstation/master/.github/sources.list | sudo tee /etc/apt/sources.list
67+
sudo dpkg --add-architecture i386
68+
sudo apt-get update
69+
sudo apt install libstdc++6:i386
70+
71+
- name: Cache BYOND
72+
uses: actions/cache@v1
73+
with:
74+
path: ~/BYOND
75+
key: ${{ runner.os }}-byond-${{ hashFiles('Dockerfile')}}
76+
restore-keys: ${{ runner.os }}-byond
77+
78+
- name: Setup BYOND
79+
run: |
80+
tools/travis/install_byond.sh
81+
cd $GITHUB_WORKSPACE
82+
printenv
83+
echo "::set-env name=BYOND_SYSTEM::/home/runner/BYOND/byond"
84+
echo "::set-env name=PATH::/home/runner/BYOND/byond/bin:$PATH"
85+
echo "::set-env name=LD_LIBRARY_PATH::/home/runner/BYOND/byond/bin:$LD_LIBRARY_PATH"
86+
echo "::set-env name=MANPATH::/home/runner/BYOND/byond/man:$MANPATH"
87+
88+
- name: Compile All Maps
89+
run: |
90+
tools/travis/template_dm_generator.py
91+
tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS yogstation.dme
92+
test:
93+
name: Compile and Run Tests
94+
runs-on: ubuntu-18.04
95+
services:
96+
mariadb:
97+
image: mariadb/server
98+
ports:
99+
- 3306:3306
100+
env:
101+
MARIADB_ALLOW_EMPTY_PASSWORD: yes
102+
103+
steps:
104+
- uses: actions/checkout@v2
105+
106+
- name: Install Dependencies
107+
run: |
108+
curl https://raw.githubusercontent.com/yogstation13/Yogstation/master/.github/sources.list | sudo tee /etc/apt/sources.list
109+
sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
110+
sudo dpkg --add-architecture i386
111+
sudo apt-get update
112+
sudo apt install libstdc++6:i386 gcc-multilib g++-7 g++-7-multilib libmariadb-client-lgpl-dev:i386 libmariadbd-dev
113+
114+
- name: Cache BYOND
115+
uses: actions/cache@v1
116+
with:
117+
path: ~/BYOND
118+
key: ${{ runner.os }}-byond-${{ hashFiles('Dockerfile')}}
119+
restore-keys: ${{ runner.os }}-byond
120+
121+
- name: Setup Environment
122+
run: |
123+
tools/travis/install_byond.sh
124+
echo "::set-env name=BYOND_SYSTEM::/home/runner/BYOND/byond"
125+
echo "::set-env name=PATH::/home/runner/BYOND/byond/bin:$PATH"
126+
echo "::set-env name=LD_LIBRARY_PATH::/home/runner/BYOND/byond/bin:$LD_LIBRARY_PATH"
127+
echo "::set-env name=MANPATH::/home/runner/BYOND/byond/man:$MANPATH"
128+
cd $GITHUB_WORKSPACE
129+
tools/travis/install_libmariadb.sh
130+
tools/travis/install_rust_g.sh
131+
mysql -u root -h 127.0.0.1 -e 'CREATE DATABASE tg_travis;'
132+
mysql -u root -h 127.0.0.1 tg_travis < SQL/tgstation_schema.sql
133+
mysql -u root -h 127.0.0.1 -e 'CREATE DATABASE tg_travis_prefixed;'
134+
mysql -u root -h 127.0.0.1 tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql
135+
tools/travis/build_bsql.sh
136+
137+
- name: Compile
138+
run: |
139+
tools/travis/dm.sh -DTRAVISBUILDING yogstation.dme || travis_terminate 1
140+
141+
- name: Prepare Artifacts
142+
run: |
143+
mkdir artifacts
144+
cp yogstation.dmb artifacts
145+
cp yogstation.rsc artifacts
146+
147+
- name: Upload Artifacts
148+
uses: actions/upload-artifact@v1
149+
with:
150+
name: DMB + RSC
151+
path: ${{github.workspace}}/artifacts
152+
153+
- name: Run Tests
154+
run: |
155+
tools/travis/run_server.sh
156+

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,4 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
214214
*.orig
215215

216216
#Debugging and other stuff
217-
byond-extools.dll
218-
extools.dll
217+
extools.dll

‎.travis.yml‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)