Merge branch 'master' of https://github.com/Alwayswannahunt/space-sta…

…tion-220 into ninja-targets

.github/CODEOWNERS

@@ -2,57 +2,38 @@
 
 # Sorting by path instead of by who added it one day :(
 # this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
-/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
 
-# Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
-# You need to add your name to these entries, not make a new one, if you care about them.
-/Content.*/Toolshed/ @moonheart08
-**/Toolshed/** @moonheart08
-*Command.cs @moonheart08
-/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
-/Content.*/Station/ @moonheart08
-/Content.*/Maps/ @moonheart08
-/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
-/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
-/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
-/Resources/ServerInfo/Guidebook/ServerRules/ @Chief-Engineer
-/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
-/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
+/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr
+/Content.*/Administration/ @DrSmugleaf @nikthechampiongr
+/Resources/ServerInfo/ @nikthechampiongr
+/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr
 
 /Resources/Prototypes/Maps/** @Emisse
 
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
 /Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Resources/Prototypes/Guidebook/rules.yml @Chief-Engineer
+/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr
 /Content.*/Body/ @DrSmugleaf
 /Content.YAMLLinter @DrSmugleaf
 /Content.Shared/Damage/ @DrSmugleaf
 
-/Content.*/Anomaly/ @EmoGarbage404 @TheShuEd
-/Content.*/Lathe/ @EmoGarbage404
-/Content.*/Materials/ @EmoGarbage404
-/Content.*/Mech/ @EmoGarbage404
-/Content.*/Research/ @EmoGarbage404
-/Content.*/Stack/ @EmoGarbage404
-/Content.*/Xenoarchaeology/ @EmoGarbage404
-/Content.*/Zombies/ @EmoGarbage404
-/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404 @TheShuEd
-/Resources/Prototypes/Research/ @EmoGarbage404
+/Content.*/Anomaly/ @TheShuEd
+/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @TheShuEd
 
 /Content.*/Forensics/ @ficcialfaint
 
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
+/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr
 /Pow3r/ @PJB3005
 /Content.Server/Power/Pow3r/ @PJB3005
 
 # notafet
 /Content.*/Atmos/ @Partmedia
 /Content.*/Botany/ @Partmedia
 
-#Jezi
+# Jezi
 /Content.*/Medical @Jezithyr
 /Content.*/Body @Jezithyr
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,4 +1,4 @@
-name: "Сообщить о проблеме"
+name: "Сообщить об ошибке"
 description: "Если что-то работает не так, как ожидалось."
 labels: ["triage"]
 body:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,4 @@
 contact_links:
-  - name: Предложение
-    url: https://discord.station14.ru
-    about: Свои предложения можете оставлять в соответствующем канале Discord.
-  - name: Сообщить об уязвимости
-    url: https://discord.station14.ru
-    about: Пожалуйста, сообщайте о серьезных эксплойтах и уязвимостях безопасности Morty#7384 (369476049836310528) в Discord.
+  - name: Предложение или идея
+    url: https://discord.gg/ss220
+    about: Свои предложения или идеи вы можете оставить в соответствующем Discord канале "#ss14-Трекер".

.github/ISSUE_TEMPLATE/mapping_issue.yml

@@ -0,0 +1,47 @@
+name: Сообщить о проблеме с игровой картой
+description: Если заметили недочёты на игровых картах
+title: "[MI] На карте проблема в "
+labels: []
+assignees:
+  - UrPrice
+body:
+  - type: markdown
+    id: markdown_with_multiline_content
+    attributes:
+      value: |
+        ## Приветствую!
+        Эта страница замещает старый сбор фидбека по игровым картам. Теперь всё происходит гораздо проще,
+        вы всегда можете оставить свой фидбек на этой странице, использую одну и ту же форму фидбека.
+        Вам **не нужно искать нужный тред в дискорде**, чтобы сообщить о проблеме, так как теперь достаточно
+        **выбрать карту из предложенных вариантов**, либо указать, что ваша проблема не по теме карты.
+        Вы всё также можете прикрепить описание и изображение.
+
+        ## Начнём!
+    validations:
+      required: false
+  - type: dropdown
+    id: map
+    attributes:
+      label: Выберите игровую карту
+      description: Из выпадающего списка выберите ту игровую карту, на которой вы столкнулись с проблемой. Если карта вам неизвестна или проблема связана с чем-либо другим, оставьте "Другое".
+      options:
+        - Frankenstein
+        - Axioma
+        - Donuts
+        - Eclipse
+        - Astro
+        - Другое
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Опишите кратко о том, какую проблему вы обнаружили
+      placeholder: Например, "На карте Axioma отсутствуют кулеры в юридическом отделе."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Прикрепите изображение описанной вами проблемы
+      placeholder: "Сюда его можно просто вставить: Ctrl+V"
+    validations:
+      required: false

.github/labeler.yml

@@ -30,3 +30,4 @@
 "Changes: C#":
 - changed-files:
   - any-glob-to-any-file: '**/*.cs'
+

.github/workflows/labeler-approve.yml

@@ -6,12 +6,11 @@ on:
 
 jobs:
   remove_label:
-    permissions:
-      contents: write
-      pull-requests: write
-      statuses: write
     if: github.event.review.state == 'approved'
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
     steps:
     - uses: actions-ecosystem/action-remove-labels@v1
       with:

.github/workflows/labeler-changes.yml

@@ -6,10 +6,11 @@ on:
 
 jobs:
   update_label:
-    permissions:
-      pull-requests: write
     if: github.event.review.state == 'changes_requested'
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:

.github/workflows/labeler-mapping-issues-and-untriaged.yml

@@ -0,0 +1,51 @@
+name: "Mapping issues"
+
+on:
+  issues:
+    type: [opened]
+
+jobs:
+  add-labels-and-assigness:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check option and add label
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const issueBody = context.payload.issue.body;
+            const options = {
+              'Frankenstein': {label: 'MI: Frankenstein', assignee: 'UrPrice' },
+              'Axioma': {label: 'MI: Axioma', assignee: 'NightmareStalker'},
+              'Donuts': {label: 'MI: Donuts', assignee: 'spo9k'},
+              'Eclipse': {label: 'MI: Eclipse', assignee: 'AliceValestray'},
+              'Astro': {label: 'MI: Astro', assignee: 'UrPrice'},
+              'Другое': {label: 'MI: Other', assignee: 'UrPrice'}
+            };
+            let selectedOption = null;
+            for (const option in options){
+              if (issueBody.includes(option)) {
+                selectedOption = options[option];
+                break;
+              }
+            }
+            if (selectedOption) {
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                labels: [selectedOption.label]
+              }); // added label
+              await github.rest.issues.addAssignees({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                assignees: [selectedOption.assignee]
+              }); // added assignee
+            } else {
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                labels: ["Status: Needs Labels"]
+              }); // add "Status: Needs Labels"
+            }

Content.Client/Actions/ActionsSystem.cs

@@ -258,13 +258,13 @@ public void UnlinkAllActions()
 
         public void LinkAllActions(ActionsComponent? actions = null)
         {
-             if (_playerManager.LocalEntity is not { } user ||
-                 !Resolve(user, ref actions, false))
-             {
-                 return;
-             }
+            if (_playerManager.LocalEntity is not { } user ||
+                !Resolve(user, ref actions, false))
+            {
+                return;
+            }
 
-             LinkActions?.Invoke(actions);
+            LinkActions?.Invoke(actions);
         }
 
         public override void Shutdown()

Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs

@@ -31,19 +31,6 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
         [AtmosAlarmType.Danger] = "atmos-alerts-window-danger-state",
     };
 
-    private Dictionary<Gas, string> _gasShorthands = new Dictionary<Gas, string>()
-    {
-        [Gas.Ammonia] = "NH₃",
-        [Gas.CarbonDioxide] = "CO₂",
-        [Gas.Frezon] = "F",
-        [Gas.Nitrogen] = "N₂",
-        [Gas.NitrousOxide] = "N₂O",
-        [Gas.Oxygen] = "O₂",
-        [Gas.Plasma] = "P",
-        [Gas.Tritium] = "T",
-        [Gas.WaterVapor] = "H₂O",
-    };
-
     public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
     {
         RobustXamlLoader.Load(this);
@@ -162,12 +149,11 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
                     foreach ((var gas, (var mol, var percent, var alert)) in keyValuePairs)
                     {
                         FixedPoint2 gasPercent = percent * 100f;
-
-                        var gasShorthand = _gasShorthands.GetValueOrDefault(gas, "X");
+                        var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
 
                         var gasLabel = new Label()
                         {
-                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
+                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
                             FontOverride = normalFont,
                             FontColorOverride = GetAlarmStateColor(alert),
                             HorizontalAlignment = HAlignment.Center,

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs

@@ -0,0 +1,40 @@
+using Content.Shared.Atmos.Components;
+
+namespace Content.Client.Atmos.Consoles;
+
+public sealed class AtmosMonitoringConsoleBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private AtmosMonitoringConsoleWindow? _menu;
+
+    public AtmosMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new AtmosMonitoringConsoleWindow(this, Owner);
+        _menu.OpenCentered();
+        _menu.OnClose += Close;
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not AtmosMonitoringConsoleBoundInterfaceState castState)
+            return;
+
+        EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
+        _menu?.UpdateUI(xform?.Coordinates, castState.AtmosNetworks);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+
+        _menu?.Dispose();
+    }
+}