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

Commit 775de60

Browse files
authored
Merge branch 'master' into ToxinChemicalsRework
2 parents bde0342 + ae2886b commit 775de60

File tree

729 files changed

+14623
-178527
lines changed

Some content is hidden

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

729 files changed

+14623
-178527
lines changed

.github/ISSUE_TEMPLATE/00-bug-report.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ body:
5151
description: Also known as ckey, its the username you use to login on BYOND.
5252
placeholder: "Player1702"
5353

54+
- type: input
55+
attributes:
56+
label: BYOND version
57+
description: You can check this by opening BYOND, clicking the settings button, clicking on "About BYOND...", and the version will be in the lower left corner.
58+
placeholder: "123.4567"
59+
validations:
60+
required: true
61+
5462
- type: dropdown
5563
attributes:
5664
label: Was this done on a locally hosted or non-Yogstation hosted server?

.github/workflows/autodoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
with:
1515
ref: master
1616

.github/workflows/compile_changelogs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
python -m pip install pyyaml
2323
sudo apt-get install dos2unix
2424
- name: "Checkout"
25-
uses: actions/checkout@v1
25+
uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 25
2828
- name: "Compile"

.github/workflows/turdis.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
name: Lints
1717
runs-on: ubuntu-20.04
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020

2121
- name: Cache SpacemanDMM
22-
uses: actions/cache@v1
22+
uses: actions/cache@v4
2323
with:
2424
path: ~/SpacemanDMM
2525
key: ${{ runner.os }}-dreamchecker-${{ hashFiles('dependencies.sh')}}
@@ -66,6 +66,10 @@ jobs:
6666
cancel-in-progress: true
6767
steps:
6868
- uses: actions/checkout@v4
69+
- name: Setup .NET SDK
70+
uses: actions/[email protected]
71+
with:
72+
dotnet-version: 9.x
6973
- uses: robinraju/[email protected]
7074
with:
7175
repository: "OpenDreamProject/OpenDream"
@@ -80,7 +84,7 @@ jobs:
8084
name: Compile All Maps
8185
runs-on: ubuntu-20.04
8286
steps:
83-
- uses: actions/checkout@v2
87+
- uses: actions/checkout@v4
8488

8589
- name: Install Dependencies
8690
run: |
@@ -89,7 +93,7 @@ jobs:
8993
sudo apt install libstdc++6:i386
9094
9195
- name: Restore Cache BYOND
92-
uses: actions/cache@v1
96+
uses: actions/cache@v4
9397
with:
9498
path: ~/BYOND
9599
key: ${{ runner.os }}-byond-${{ hashFiles('Dockerfile')}}
@@ -114,7 +118,7 @@ jobs:
114118
outputs:
115119
maps: ${{ steps.map_finder.outputs.maps }}
116120
steps:
117-
- uses: actions/checkout@v2
121+
- uses: actions/checkout@v4
118122
- name: Find Maps
119123
id: map_finder
120124
run: |
@@ -141,7 +145,7 @@ jobs:
141145
group: ci-${{ github.ref }}-${{ matrix.map }}
142146
cancel-in-progress: true
143147
steps:
144-
- uses: actions/checkout@v2
148+
- uses: actions/checkout@v4
145149

146150
- name: Install Dependencies
147151
run: |
@@ -150,20 +154,20 @@ jobs:
150154
sudo apt install libstdc++6:i386 gcc-multilib g++-7 g++-7-multilib zlib1g:i386 libssl1.1 libssl1.1:i386
151155
152156
- name: Restore Cache BYOND
153-
uses: actions/cache@v1
157+
uses: actions/cache@v4
154158
with:
155159
path: ~/BYOND
156160
key: ${{ runner.os }}-byond-${{ hashFiles('Dockerfile')}}
157161
restore-keys: ${{ runner.os }}-byond
158162

159163
- name: Restore Cache Auxmos
160-
uses: actions/cache@v1
164+
uses: actions/cache@v4
161165
with:
162166
path: ~/.byond
163167
key: auxmos-${{ hashFiles('dependencies.sh')}}
164168

165169
- name: Restore Yarn Cache
166-
uses: actions/cache@v2
170+
uses: actions/cache@v4
167171
with:
168172
path: tgui/.yarn/cache
169173
key: ${{ runner.os }}-yarn-${{ hashFiles('Dockerfile')}}

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Yogstation13 is shutting down
2+
> [!WARNING]
3+
Yogstation13 will be permanently shutting down on the 30th of April 2025. See https://forums.yogstation.net/shutdown/ for more information.
4+
5+
16
## Yogstation codebase
27

38
[![Build Status](https://github.com/yogstation13/Yogstation/workflows/Turdis/badge.svg?branch=master)](https://github.com/yogstation13/Yogstation/actions?query=workflow%3ATurdis+branch%3Amaster)

0 commit comments

Comments
 (0)