Skip to content

Commit 1accfe3

Browse files
haydenredactedhaydenredacted
committed
Merge remote-tracking branch 'upstream/master' into maps/omegastation/creation
upstream merge
2 parents 1c20c40 + f088026 commit 1accfe3

109 files changed

Lines changed: 8565 additions & 4267 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rustlibs_516_prod.dll @AffectedArc07
3333
# TGUI stuff
3434
/tgui/bin @Burzah
3535
/tgui/docs @Burzah
36+
/tgui/yarn.lock @Burzah
3637

3738

3839
### Multiple Owners

‎.github/workflows/build_rust.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
name: Build Rust library
2+
3+
permissions:
4+
contents: write
5+
pull-requests: write
6+
27
on:
38
issue_comment:
49
types: created

0 commit comments

Comments
 (0)