Upstream zak

.editorconfig

@@ -351,7 +351,7 @@ resharper_csharp_qualified_using_at_nested_scope = false
 resharper_csharp_prefer_qualified_reference = false
 resharper_csharp_allow_alias = false
 
-[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props,slnx}]
 indent_size = 2
 
 [nuget.config]

.github/CODEOWNERS

@@ -11,11 +11,13 @@
 /Resources/Prototypes/Maps/** @Emisse @ArtisticRoomba @spanky-spanky
 /Resources/Maps/** @Emisse @ArtisticRoomba @spanky-spanky
 
-/Resources/Prototypes/Body/ @DrSmugleaf # suffering
+/Resources/Prototypes/Body/ @DrSmugleaf @sowelipililimute # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
 /Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
 /Resources/Prototypes/Guidebook/rules.yml @crazybrain23
-/Content.*/Body/ @DrSmugleaf
+/Content.*/Body/ @DrSmugleaf @sowelipililimute
+/Content.*/Humanoid/ @sowelipililimute
+/Content.Client/Lobby/UI/Humanoid* @sowelipililimute
 /Content.YAMLLinter @DrSmugleaf
 /Content.Shared/Damage/ @DrSmugleaf
 
@@ -24,23 +26,18 @@
 
 /Content.*/Forensics/ @ficcialfaint
 
-/Content.*/Trigger/ @slarticodefast
+/Content.*/HeatContainer/ @slarticodefast
 
 /Content.*/Stunnable/ @Princess-Cheeseballs
 /Content.*/Nutrition/ @Princess-Cheeseballs
+/Content.*/EntityEffects @Princess-Cheeseballs @sowelipililimute
 
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
 /Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @crazybrain23
 /Pow3r/ @PJB3005
 /Content.Server/Power/Pow3r/ @PJB3005
 
-
-# Sloth
-/Content.*/Audio @metalgearsloth
-/Content.*/Movement @metalgearsloth
-/Content.*/NPC @metalgearsloth
-/Content.*/Shuttles @metalgearsloth
-/Content.*/Weapons @metalgearsloth
-
 /Content.Server/Discord/ @Simyon264
+
+/Content.*/Atmos/** @ArtisticRoomba

.github/ISSUE_TEMPLATE/01_report_issue.yml

@@ -0,0 +1,41 @@
+name: Report an issue
+description: For issues that are not related to any other issue form.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out an issue. This template is intended for any issues that do not fit other issue templates.
+        For feedback or help running Space Station 14, please join our [Discord](https://discord.gg/rGvu9hKffJ).
+  - type: input
+    attributes:
+      label: What version did the issue occur in?
+      description: You can find the version by opening the changelog in-game and looking at the bottom right corner of the changelog window.
+      placeholder: wizards/aa1337b
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of what the issue is.
+        If the issue is visual in nature, consider posting a screenshot.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reproduction
+      description: List the steps required to reproduce the issue.
+      placeholder: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other additional context about the issue here.
+    validations:
+      required: false
+

.github/ISSUE_TEMPLATE/02_mapping_issue.yml

@@ -0,0 +1,48 @@
+name: Report an mapping issue
+description: For issues regarding mapping.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out an issue. This template is intended for any issues related to mapping.
+        For feedback or help running Space Station 14, please join our [Discord](https://discord.gg/rGvu9hKffJ).
+  - type: input
+    attributes:
+      label: What version did the issue occur in?
+      description: You can find the version by opening the changelog in-game and looking at the bottom right corner of the changelog window.
+      placeholder: wizards/aa1337b
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: On what station, shuttle, or grid did the issue occur on?
+      description: The name of the station, shuttle, or grid. If you do not know the name, try to describe it.
+      placeholder: Bagel
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of what the issue is.
+        If the issue is visual in nature, consider posting a screenshot.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reproduction
+      description: List the steps required to reproduce the issue.
+      placeholder: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other additional context about the issue here.
+    validations:
+      required: false
+

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,5 @@
+blank_issues_enabled: true
 contact_links:
-  - name: Report a Security Vulnerability
-    url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md
-    about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed.
   - name: Request a Feature
     url: https://discord.gg/rGvu9hKffJ
     about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).

.github/PULL_REQUEST_TEMPLATE.md

@@ -26,12 +26,6 @@
 -->
 Изменения:
 
-<!--
-    Пример правильного заполнения:
-
-    Тип: tweak
-    Изменения: Урон от туллбокса был увеличен в два раза
--->
 
 ## Технические детали
 <!-- Сводка изменений кода для более удобного просмотра. -->