Merge branch 'master' into translate

ss220club · Aug 23, 2024 · cfa23ee · cfa23ee
2 parents b2ca684 + 057aa32
commit cfa23ee
Show file tree

Hide file tree

Showing 138 changed files with 5,592 additions and 5,076 deletions.
diff --git a/.github/ISSUE_TEMPLATE/issue_report.yml b/.github/ISSUE_TEMPLATE/issue_report.yml
@@ -10,9 +10,9 @@
 #    label:       | Box title |
 #    description: | Box small text - Description |
 #
-name: "Issue Report"
+name: 'Issue Report'
 #title: "[Bug]: " | if you want to have a have it automatically say [Bug] when they start the form
-description: "Доложите о проблемах или багах, что бы мы могли их исправить."
+description: 'Доложите о проблемах или багах, что бы мы могли их исправить.'
 #labels: "Баг"
 
 body:
@@ -24,7 +24,9 @@ body:
     id: version
     attributes:
       label: BYOND Version
-      description: "На какой версии BYOND встретился баг. (Если уверены, что не связано, можно пропустить)"
+      description: 'На какой версии BYOND встретился баг. (Если уверены, что не связано, можно пропустить)'
+    validations:
+      required: true
 
   - type: textarea
     id: description

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,7 +8,8 @@
 	"typescript.enablePromptUseWorkspaceTsdk": true,
 	"search.exclude": {
 		"**/.yarn": true,
-		"**/.pnp.*": true
+		"**/.pnp.*": true,
+		"tgui/public/**/*": true
 	},
 	"eslint.format.enable": true,
 	"eslint.rules.customizations": [

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -42,10 +42,14 @@ It is expected that contributors discuss larger changes on the [Paradise Station
 
 For changes to content listed below, contributors **must** obtain approval from a headcoder or a member of either the balance, design, mapping, or sprite team (depending on which teams are relevant to the changes) before opening their Pull Request. This approval must be displayed in the Pull Request description body in the form of a screenshot. The Headcoders may grant an exemption to this requirement on a case-by-case basis, as the need arises.
 
-### Currently, changes to the following types of content requires pre-approval:
-  - Security content (excluding fixes, code improvement, refactors, sprites, and mapping changes)
-  - Antagonist content (excluding fixes, code improvement, refactors, sprites, and mapping changes)
-  - Species content (excluding fixes, code improvement, and refactors)
-  - Large changes (for example PRs that touch multiple systems, many files, many lines of code)
-  - Changes that might be controversial
-  - Changes with wide-ranging balance or design implications
+<!-- Add a fixed link so that changing the heading name doesn't break the link. -->
+<a id="types-of-changes-that-need-approval"></a>
+
+> [!IMPORTANT]
+> ### Currently, changes to the following types of content requires pre-approval:
+>  - **Security content (excluding fixes, code improvement, refactors, sprites, and mapping changes)**
+>  - **Antagonist content (excluding fixes, code improvement, refactors, sprites, and mapping changes)**
+>  - **Species content (excluding fixes, code improvement, and refactors)**
+>  - **Large changes (for example PRs that touch multiple systems, many files, many lines of code)**
+>  - **Changes that might be controversial**
+>  - **Changes with wide-ranging balance or design implications**