forked from cmss13-devs/cmss13
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/567Turtle/cmss13
- Loading branch information
Showing
3,911 changed files
with
523,165 additions
and
315,883 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,46 @@ | ||
# dmm map merger hook | ||
# needs additional setup, see tools/mapmerge/install.txt | ||
*.dmm merge=merge-dmm | ||
* text=auto | ||
|
||
# dmi icon merger hook | ||
# needs additional setup, see tools/dmitool/merging.txt | ||
*.dmi merge=merge-dmi | ||
|
||
# force changelog merging to use union | ||
html/changelog.html merge=union | ||
|
||
# Declare files that will always have LF line endings on checkout. | ||
## Enforce text mode and LF line breaks | ||
*.bat text eol=lf | ||
*.cjs text eol=lf | ||
*.css text eol=lf | ||
*.dm text eol=lf | ||
*.dmm text eol=lf | ||
*.dme text eol=lf | ||
*.dmf text eol=lf | ||
*.htm text eol=lf | ||
*.html text eol=lf | ||
*.js text eol=lf | ||
*.json text eol=lf | ||
*.jsx text eol=lf | ||
*.md text eol=lf | ||
*.ps1 text eol=lf | ||
*.py text eol=lf | ||
*.scss text eol=lf | ||
*.sql text eol=lf | ||
*.svg text eol=lf | ||
*.ts text eol=lf | ||
*.tsx text eol=lf | ||
*.txt text eol=lf | ||
*.yaml text eol=lf | ||
*.yml text eol=lf | ||
*.sh text eol=lf | ||
Dockerfile eol=lf | ||
|
||
## Enforce binary mode | ||
*.bmp binary | ||
*.dll binary | ||
*.dmb binary | ||
*.exe binary | ||
*.gif binary | ||
*.jpg binary | ||
*.png binary | ||
*.so binary | ||
|
||
## Merger hooks, run tools/hooks/install.bat or install.sh to set up | ||
*.dmm text eol=lf merge=dmm | ||
*.dmi binary merge=dmi | ||
|
||
## Force tab indents on dm files | ||
*.dm whitespace=indent-with-non-tab | ||
|
||
|
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
name: Bug Report | ||
description: File a bug report | ||
labels: ["Bug"] | ||
body: | ||
- type: input | ||
id: current-tms | ||
attributes: | ||
label: Testmerges | ||
description: Are there any current TMs on the server? You can see this from the message when you join, or via using the OOC -> Show Revision Info verb. If you're certain the issue is to be caused by a test merge, report it in the pull request's comment section rather than on the tracker. | ||
placeholder: "#1, #2, #3, etc" | ||
validations: | ||
required: true | ||
- type: textarea | ||
id: what-happened | ||
attributes: | ||
label: Description of the bug | ||
description: What went wrong? Give us a 1-2 sentence summary. | ||
placeholder: Maintainers hate this one simple trick... | ||
validations: | ||
required: true | ||
- type: textarea | ||
id: what-should-have-happened | ||
attributes: | ||
label: What's the difference with what should have happened? | ||
description: What's the expected behaviour? | ||
placeholder: Not this. Never this... | ||
validations: | ||
required: true | ||
- type: textarea | ||
id: reproduction | ||
attributes: | ||
label: How do we reproduce this bug? | ||
description: Using as much detail as necessary, give us the steps to reproducing this error. | ||
value: | | ||
1. | ||
2. | ||
3. | ||
... | ||
validations: | ||
required: true | ||
- type: checkboxes | ||
id: issue-bingo | ||
attributes: | ||
label: Issue Bingo | ||
options: | ||
- label: Issue could be reproduced at least once | ||
- label: Issue happened in a recent (less than 7 days ago) round | ||
- label: Couldn't find an existing issue about this (https://github.com/cmss13-devs/cmss13/issues) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
blank_issues_enabled: false | ||
contact_links: | ||
- name: Game Breaking Exploits | ||
url: https://discord.gg/cmss13 | ||
about: Securely disclose high priority issues to a member of the Maintainer Team here. |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.