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
MosleyTheMalO committed Aug 19, 2024
2 parents 6ff29f3 + 4f6592c commit 2521292
Show file tree
Hide file tree
Showing 365 changed files with 17,034 additions and 13,979 deletions.
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@
/code/ @nevimer @magatsuchi @Cyprex
/modular_zubbers/ @nevimer @magatsuchi @Cyprex
/_maps/ @KathrinBailey

# Waterpig
/code/modules/surgery @Majkl-J
/modular_skyrat/master_files/code/modules/surgery @Majkl-J
/modular_skyrat/modules/synths @Majkl-J
29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report_form.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Bug report
description: Create a report to help reproduce and fix the issue.
body:
- type: markdown
attributes:
value: |
## **Please read the following guidelines. Follow all instructions or else your issue is subject to closure.**
If you are reporting an issue found in another branch or codebase, you MUST link the branch or codebase repo in your issue report or it will be closed.
For branches, If you have not pushed your code up, you must either reproduce it on master or push your code up before making an issue report.
For other codebases, if you do not have a public code repo you will be refused help unless you can completely reproduce the issue on our code.
- type: input
id: reporting-version
attributes:
label: Client Version
description: |
The BYOND version you are using to report this issue. You can find this information in the bottom left corner of the "About BYOND" window in the BYOND client.
It is strongly recommended that you include this, especially for concerns on the visual aspects of the game.
placeholder: "515.1642"
validations:
required: false
- type: textarea
id: issue-summary
attributes:
label: Issue Summary
description: |
Briefly explain your issue in a few plain sentences. You may copy and paste the issue title here if it is suitable.
placeholder: |
"When I do X, Y happens instead of Z."
"X on Y map has Z issue."
validations:
required: true
- type: input
id: round-id
attributes:
label: Round ID
description: |
If you discovered this issue from playing tgstation hosted servers, the Round ID can be found in the Status panel or retrieved from https://sb.atlantaned.space/rounds
The Round ID lets us look up valuable information and logs for the round the bug happened. Leave this blank if there is no round ID.
placeholder: "123456"
validations:
required: false
- type: textarea
id: test-merges
attributes:
label: Test Merges
description: |
If you're certain the issue is to be caused by a test merge [OOC tab -> Show Server Revision], report it in the pull request's comment section rather than on the tracker.
If you're unsure you can refer to the issue number by prefixing said number with #. The issue number can be found beside the title after submitting it to the tracker.
If no testmerges are active, feel free to leave this section blank.
validations:
required: false
- type: textarea
id: reproduction
attributes:
label: Reproduction steps
description: |
Describe the steps to reproduce the issue in detail. Include any relevant information, such as the map, round type, and any other factors that may be relevant.
If it is a runtime-related error, please include the runtime here as that is pertient information. Issues are not for oddities introduced by admin varedits, ensure these occur in normal circumstances.
placeholder: |
1. Go to the X location
2. Do Y action
3. Observe Z result
validations:
required: true
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: Feature Requests
url: https://tgstation13.org/phpBB/viewforum.php?f=9
about: Post feature requests and suggestions on the forums. This repository does not handle them.

19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
# Ignore compiled linux libs in the root folder, e.g. librust_g.so
/*.so

#

#Ignore compiled files and other files generated during compilation.
*.mdme
*.mdme.*
Expand All @@ -35,6 +37,16 @@
*.lk
*.int
*.backup

# Ignore tools ported over from SpacemanDMM for personal use
.fingerprint
build/
deps/
incremental/
dmm-tools.exe
dmm-tools.d
git-diagnostics-2024-08-11-1513.zip

### https://raw.github.com/github/gitignore/cc542de017c606138a87ee4880e5f06b3a306def/Global/Linux.gitignore

*~
Expand Down Expand Up @@ -247,3 +259,10 @@ define_sanity_output.txt
# ezdb
/db/
/config/ezdb.txt
<<<<<<< HEAD
=======

# Running OpenDream locally
tgstation.json
.cargo-lock
>>>>>>> 5d81843b3302 (Raptor faction fix (#85792))
Loading

0 comments on commit 2521292

Please sign in to comment.