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

Commit e34af45

Browse files
authored
Merge branch 'yogstation13:master' into ToxinChemicalsRework
2 parents 4ec0597 + 05253b5 commit e34af45

File tree

268 files changed

+5558
-2776
lines changed

Some content is hidden

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

268 files changed

+5558
-2776
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ Important documentation information includes, but is not limited to: any numeric
3232
<!-- Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR that has player-facing changes.
3333
If you add a name after the ':cl:', that name will be used in the changelog. Leave it empty to use your GitHub name. -->
3434

35-
:cl:
35+
:cl:
3636
rscadd: Added new things
3737
rscdel: Removed old things
38-
bugfix: fixed a few things
38+
bugfix: Fixed a few things
3939
wip: This is work in progress
40-
tweak: tweaked a few things
41-
soundadd: added a new sound thingy
42-
sounddel: removed an old sound thingy
43-
imageadd: added some icons and images
44-
imagedel: deleted some icons and images
40+
tweak: Tweaked a few things
41+
soundadd: Added a new sound thingy
42+
sounddel: Removed an old sound thingy
43+
imageadd: Added some icons and images
44+
imagedel: Deleted some icons and images
4545
mapping: This is a mapping change
46-
spellcheck: fixed a few typos
46+
spellcheck: Fixed a few typos
4747
experimental: This is experimental
4848
/:cl:

.github/workflows/turdis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
cp yogstation.rsc artifacts
194194
195195
- name: Upload Artifacts
196-
uses: actions/upload-artifact@v1
196+
uses: actions/upload-artifact@v4
197197
with:
198198
name: DMB + RSC ${{matrix.map}}
199199
path: ${{github.workspace}}/artifacts

0 commit comments

Comments
 (0)