Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
OctusGit committed Nov 14, 2024
2 parents 4a5555d + 6ef49ba commit c25718c
Show file tree
Hide file tree
Showing 3,981 changed files with 392,260 additions and 145,407 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 6 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,10 @@ _build_dependencies.sh @AffectedArc07

# Executables that need to be security-cleared
dreamchecker.exe @AffectedArc07
milla.dll @AffectedArc07
rust_g.dll @AffectedArc07
librust_g.so @AffectedArc07

### S34NW

# TGUI stuff
/tgui/bin @S34NW
828 changes: 0 additions & 828 deletions .github/CONTRIBUTING.md

This file was deleted.

103 changes: 0 additions & 103 deletions .github/DOWNLOADING.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/issue_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ body:
id: version
attributes:
label: BYOND Version
description: "What BYOND version were you using when the issue occured? (Find this by pressing the cog in the top-right of the main BYOND menu, then 'About BYOND...') (Required)"
description: "What BYOND version were you using when the issue occurred? (Find this by pressing the cog in the top-right of the main BYOND menu, then 'About BYOND...') (Required)"
validations:
required: true

Expand Down
14 changes: 14 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,34 @@
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do

<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->

## Why It's Good For The Game

<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Images of changes

<!-- If you did not make a map or sprite edit, you may delete this section. You may include a gif or mp4 of your feature if you want. -->

## Testing

<!-- How did you test the PR, if at all? -->

<hr>

### Declaration

- [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
<!-- Replace the box with [x] to mark as complete. -->
<!-- Ensure there are no spaces between the x and the square brackets [] else this will not work properly. -->
<hr>

## Changelog

:cl:
add: Added new things
del: Removed old things
Expand Down
178 changes: 0 additions & 178 deletions .github/SETTING_UP_GIT.md

This file was deleted.

21 changes: 0 additions & 21 deletions .github/TICK_ORDER.md

This file was deleted.

Loading

0 comments on commit c25718c

Please sign in to comment.