Merge branch 'master' into pr/748

.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

@@ -1,4 +1,4 @@
-"Changes: Sprites":
+"Changes: Sprites":
 - changed-files:
   - any-glob-to-any-file: '**/*.rsi/*.png'
 
@@ -23,6 +23,11 @@
 "Changes: Prototypes":
 - changed-files:
   # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.
-  - all-globs-to-all-files:
+  - all-globs-to-any-file:
     - "Resources/Prototypes/**/*.yml"
     - '!Resources/Prototypes/Maps/**/*.yml'
+
+"Changes: C#":
+- changed-files:
+  - any-glob-to-any-file: '**/*.cs'
+

.github/workflows/labeler-approve.yml

@@ -6,10 +6,11 @@ on:
 
 jobs:
   remove_label:
-    permissions:
-      pull-requests: 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/Access/UI/IdCardConsoleWindow.xaml.cs

@@ -150,6 +150,13 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
 
             FullNameLabel.Modulate = interfaceEnabled ? Color.White : Color.Gray;
             FullNameLineEdit.Editable = interfaceEnabled;
+
+            //ss220 format name fix start
+            FullNameLineEdit.Text = FullNameLineEdit.Text
+                .Replace('[', '(')
+                .Replace(']', ')');
+            //ss220 format name fix end
+
             if (!fullNameDirty)
             {
                 FullNameLineEdit.Text = state.TargetIdFullName ?? string.Empty;
@@ -159,6 +166,13 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
 
             JobTitleLabel.Modulate = interfaceEnabled ? Color.White : Color.Gray;
             JobTitleLineEdit.Editable = interfaceEnabled;
+
+            //ss220 format name fix start
+            JobTitleLineEdit.Text = JobTitleLineEdit.Text
+                .Replace('[', '(')
+                .Replace(']', ')');
+            //ss220 format name fix end
+
             if (!jobTitleDirty)
             {
                 JobTitleLineEdit.Text = state.TargetIdJobTitle ?? string.Empty;
@@ -194,10 +208,12 @@ private void SubmitData()
             var jobProtoDirty = _lastJobProto != null &&
                                 _jobPrototypeIds[JobPresetOptionButton.SelectedId] != _lastJobProto;
 
+            var fullNameSafe = FullNameLineEdit.Text.Replace("[", "(").Replace("]", ")"); //ss220 format name fix start
+            var jobTitleSafe = JobTitleLineEdit.Text.Replace("[", "(").Replace("]", ")"); //ss220 format name fix start
+
             _owner.SubmitData(
-                FullNameLineEdit.Text,
-                JobTitleLineEdit.Text,
-                // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
+                fullNameSafe, //ss220 format name fix
+                jobTitleSafe, //ss220 format name fix
                 _accessButtons.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
                 jobProtoDirty ? _jobPrototypeIds[JobPresetOptionButton.SelectedId] : string.Empty);
         }

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/Administration/UI/BanPanel/BanPanel.xaml.cs

@@ -22,11 +22,11 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, int, string[]?, bool, bool>? BanSubmitted;
+    public event Action<string?, (IPAddress, int)?, bool, ImmutableTypedHwid?, bool, uint, string, NoteSeverity, int, string[]?, bool, bool>? BanSubmitted;
     public event Action<string>? PlayerChanged;
     private string? PlayerUsername { get; set; }
     private (IPAddress, int)? IpAddress { get; set; }
-    private byte[]? Hwid { get; set; }
+    private ImmutableTypedHwid? Hwid { get; set; }
     private double TimeEntered { get; set; }
     private int statedRoundEntered { get; set; }
     private uint Multiplier { get; set; }
@@ -392,9 +392,8 @@ private void OnIpChanged()
     private void OnHwidChanged()
     {
         var hwidString = HwidLine.Text;
-        var length = 3 * (hwidString.Length / 4) - hwidString.TakeLast(2).Count(c => c == '=');
-        Hwid = new byte[length];
-        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !Convert.TryFromBase64String(hwidString, Hwid, out _))
+        ImmutableTypedHwid? hwid = null;
+        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !ImmutableTypedHwid.TryParse(hwidString, out hwid))
         {
             ErrorLevel |= ErrorLevelEnum.Hwid;
             HwidLine.ModulateSelfOverride = Color.Red;
@@ -411,7 +410,7 @@ private void OnHwidChanged()
             Hwid = null;
             return;
         }
-        Hwid = Convert.FromHexString(hwidString);
+        Hwid = hwid;
     }
 
     private void OnTypeChanged()

Content.Client/Administration/UI/Notes/NoteEdit.xaml

@@ -8,6 +8,7 @@
             <Label Name="ExpiryLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
             <HistoryLineEdit Name="ExpiryLineEdit" PlaceHolder="{Loc admin-note-editor-expiry-placeholder}"
                              Visible="False" HorizontalExpand="True" />
+            <OptionButton Name="ExpiryLengthDropdown" Visible="False" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <OptionButton Name="TypeOption" HorizontalAlignment="Center" />