Merge branch 'greatchanges' of https://github.com/KashRas2/MorbinTime …

…into greatchanges

.github/CODEOWNERS

@@ -5,3 +5,7 @@
 
 # Ping for all PRs that include translations/editing fluent strings
 *.ftl @ficcialfaint
+
+# Map files
+/Resources/Prototypes/Maps/** @Ko4ergaPunk 
+/Resources/Maps/** @Ko4ergaPunk 

.github/labeler.yml

@@ -21,7 +21,7 @@
 - changed-files:
   - any-glob-to-any-file: '**/*.ftl'
 
-"No C#":
+"Changes: No C#":
 - 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: "!**/*.cs"

.github/workflows/conflict-labeler.yml → .github/workflows/labeler-conflict.yml

@@ -16,6 +16,6 @@ jobs:
       - name: Check for Merge Conflicts
         uses: eps1lon/[email protected]
         with:
-          dirtyLabel: "Merge Conflict"
+          dirtyLabel: "S: Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

.github/workflows/labeler-needsreview.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "Status: Needs Review"
+        labels: "S: Needs Review"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
-        labels: "Status: Awaiting Changes"
+        labels: "S: Awaiting Changes"

.github/workflows/labeler-size.yml

@@ -0,0 +1,20 @@
+name: "Labels: Size"
+on: pull_request_target
+jobs:
+  size-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: size-label
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          # Custom size configuration
+          sizes: >
+            {
+              "0": "XS",
+              "10": "S",
+              "30": "M",
+              "100": "L",
+              "1000": "XL"
+            }

.github/workflows/labeler-stable.yml

@@ -0,0 +1,16 @@
+name: "Labels: Branch stable"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+    branches:
+      - 'stable'
+
+jobs:
+  add_label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: "Branch: Stable"

.github/workflows/labeler-staging.yml

@@ -0,0 +1,16 @@
+name: "Labels: Branch staging"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+    branches:
+      - 'staging'
+
+jobs:
+  add_label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: "Branch: Staging"

.github/workflows/labeler-untriaged.yml

@@ -3,6 +3,8 @@
 on:
   issues:
     types: [opened]
+  pull_request_target:
+    types: [opened]
 
 jobs:
   add_label:
@@ -11,4 +13,4 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       if: join(github.event.issue.labels) == ''
       with:
-        labels: "Status: Untriaged"
+        labels: "S: Untriaged"

Content.Client/ADT/Bark/Systems/HumanoidProfileEditor.Barks.cs

@@ -8,7 +8,7 @@ public sealed partial class HumanoidProfileEditor
 {
     private List<BarkPrototype> _barkList = new();
 
-    private void InitializeBarks()
+    private void InitializeBarks()  // У меня случился небольшой затуп. Оно барки в обход кнопки сохраняет, но хотя бы работает                                                                                                                                                             ы
     {
         _barkList = _prototypeManager
             .EnumeratePrototypes<BarkPrototype>()
@@ -20,6 +20,7 @@ private void InitializeBarks()
         {
             BarkProtoButton.SelectId(args.Id);
             SetBarkProto(_barkList[args.Id].ID);
+            UpdateSaveButton();
         };
 
         PitchEdit.OnTextChanged += args =>
@@ -28,6 +29,7 @@ private void InitializeBarks()
                 return;
 
             SetBarkPitch(newPitch);
+            UpdateSaveButton();
         };
 
         DelayVariationMinEdit.OnTextChanged += args =>
@@ -36,6 +38,7 @@ private void InitializeBarks()
                 return;
 
             SetBarkMinVariation(newVar);
+            UpdateSaveButton();
         };
 
         DelayVariationMaxEdit.OnTextChanged += args =>
@@ -44,6 +47,7 @@ private void InitializeBarks()
                 return;
 
             SetBarkMaxVariation(newVar);
+            UpdateSaveButton();
         };
 
         BarkPlayButton.OnPressed += _ => PlayPreviewBark();
@@ -56,9 +60,9 @@ private void UpdateBarkVoicesControls()
 
         BarkProtoButton.Clear();
 
-        PitchEdit.Text = Profile.BarkPitch.ToString();
-        DelayVariationMinEdit.Text = Profile.BarkLowVar.ToString();
-        DelayVariationMaxEdit.Text = Profile.BarkHighVar.ToString();
+        PitchEdit.Text = Profile.Bark.Pitch.ToString();
+        DelayVariationMinEdit.Text = Profile.Bark.MinVar.ToString();
+        DelayVariationMaxEdit.Text = Profile.Bark.MaxVar.ToString();
 
         var firstVoiceChoiceId = 1;
         for (var i = 0; i < _barkList.Count; i++)
@@ -72,7 +76,7 @@ private void UpdateBarkVoicesControls()
                 firstVoiceChoiceId = i;
         }
 
-        var voiceChoiceId = _barkList.FindIndex(x => x.ID == Profile.BarkProto);
+        var voiceChoiceId = _barkList.FindIndex(x => x.ID == Profile.Bark.Proto);
         if (!BarkProtoButton.TrySelectId(voiceChoiceId) &&
             BarkProtoButton.TrySelectId(firstVoiceChoiceId))
         {
@@ -85,6 +89,6 @@ private void PlayPreviewBark()
         if (Profile is null)
             return;
 
-        _entManager.System<SpeechBarksSystem>().PlayDataPrewiew(Profile.BarkProto, Profile.BarkPitch, Profile.BarkLowVar, Profile.BarkHighVar);
+        _entManager.System<SpeechBarksSystem>().PlayDataPrewiew(Profile.Bark.Proto, Profile.Bark.Pitch, Profile.Bark.MinVar, Profile.Bark.MaxVar);
     }
 }

Content.Client/ADT/_RMC14/Attachable/Components/AttachableHolderVisualsComponent.cs

@@ -0,0 +1,17 @@
+using Content.Client._RMC14.Attachable.Systems;
+using System.Numerics;
+
+namespace Content.Client._RMC14.Attachable.Components;
+
+[RegisterComponent, AutoGenerateComponentState]
+[Access(typeof(AttachableHolderVisualsSystem))]
+public sealed partial class AttachableHolderVisualsComponent : Component
+{
+    /// <summary>
+    ///     This dictionary contains a list of offsets for every slot that should display the attachable placed into it.
+    ///     If a slot is not in this dictionary, the attachable inside will not be displayed.
+    ///     The list of valid slot names can be found in AttachableHolderComponent.cs
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public Dictionary<string, Vector2> Offsets = new();
+}

Content.Client/ADT/_RMC14/Attachable/Components/AttachableVisualsComponent.cs

@@ -0,0 +1,66 @@
+using Content.Client._RMC14.Attachable.Systems;
+using System.Numerics;
+using Robust.Shared.Utility;
+
+namespace Content.Client._RMC14.Attachable.Components;
+
+[RegisterComponent, AutoGenerateComponentState]
+[Access(typeof(AttachableHolderVisualsSystem))]
+public sealed partial class AttachableVisualsComponent : Component
+{
+    /// <summary>
+    ///     Optional, only used if the item's own state should not be used.
+    ///     The path to the RSI file that contains all the attached states.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ResPath? Rsi;
+
+    /// <summary>
+    ///     Optional, only used if the item's own state should not be used.
+    ///     This prefix is added to the name of the slot the attachable is installed in.
+    ///     The prefix must be in kebab-case and end with a dash, like so: example-prefix-
+    ///     The RSI must contain a state for every slot the attachable fits into.
+    ///     If the attachment only fits into one slot, it should be named as follows: normal-state_suffix.
+    ///     The slot names can be found in AttachableHolderComponent.cs
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? Prefix;
+
+    /// <summary>
+    ///     Optional, only used if the item's own state should not be used.
+    ///     This suffix is added to the name of the slot the attachable is installed in.
+    ///     The RSI must contain a state for every slot the attachable fits into.
+    ///     If the attachment only fits into one slot, it should be named as follows: normal-state_suffix.
+    ///     The slot names can be found in AttachableHolderComponent.cs
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? Suffix = "_a";
+
+    /// <summary>
+    ///     If true, will include the holder's slot name to find this attachment's state
+    ///     in its RSI.
+    ///     In this case, there must be a separate state for each slot the attachment fits into.
+    ///     The states should be named as follows: prefix-slot-name-suffix.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IncludeSlotName;
+
+    /// <summary>
+    ///     If this is toggled on and the item has an AttachableToggleableComponent, then the visualisation system will try to show a different sprite when it's active.
+    ///     Each active state must have "-on" appended to the end of its name.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ShowActive;
+
+    /// <summary>
+    ///     If this is set to true, the attachment will be redrawn on its holder every time it receives an AppearanceChangeEvent. Useful for things like the UGL.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RedrawOnAppearanceChange;
+
+    [DataField, AutoNetworkedField]
+    public int Layer;
+
+    [DataField, AutoNetworkedField]
+    public Vector2 Offset;
+}