Merge branch 'AdventureTimeSS14:master' into KC_SS40k_turrets

.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/labeler-conflict.yml

@@ -0,0 +1,21 @@
+name: Check Merge Conflicts
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+jobs:
+  Label:
+    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'IanComradeBot' )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for Merge Conflicts
+        uses: eps1lon/[email protected]
+        with:
+          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/BookPrinter/BookPrinterBoundUserInterface.cs

@@ -0,0 +1,72 @@
+using Content.Shared.ADT.BookPrinter;
+using Content.Shared.Containers.ItemSlots;
+using JetBrains.Annotations;
+
+namespace Content.Client.ADT.BookPrinter
+{
+    [UsedImplicitly]
+    public sealed class BookPrinterBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private BookPrinterWindow? _window;
+
+        [ViewVariables]
+        private BookPrinterBoundUserInterfaceState? _lastState;
+
+        public BookPrinterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+
+            _window = new()
+            {
+                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
+            };
+
+            _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent("bookSlot"));
+            _window.ClearButton.OnPressed += _ => SendMessage(new BookPrinterClearContainerMessage());
+            _window.UploadButton.OnPressed += _ => SendMessage(new BookPrinterUploadMessage());
+            _window.CopyPasteButton.OnPressed += _ => SendMessage(new BookPrinterCopyPasteMessage());
+
+
+            _window.OpenCentered();
+            _window.OnClose += Close;
+
+            _window.OnPrintBookButtonPressed += (args, button) => SendMessage(new BookPrinterPrintBookMessage(button.BookEntry));
+            _window.OnPrintBookButtonMouseEntered += (args, button) =>
+            {
+                if (_lastState is not null)
+                    _window.UpdateContainerInfo(_lastState);
+            };
+            _window.OnPrintBookButtonMouseExited += (args, button) =>
+            {
+                if (_lastState is not null)
+                    _window.UpdateContainerInfo(_lastState);
+            };
+        }
+
+        protected override void UpdateState(BoundUserInterfaceState state)
+        {
+            base.UpdateState(state);
+
+            var castState = (BookPrinterBoundUserInterfaceState)state;
+            _lastState = castState;
+
+            _window?.UpdateState(castState);
+        }
+
+        [Obsolete]
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+
+            if (disposing)
+            {
+                _window?.Dispose();
+            }
+        }
+    }
+}

Content.Client/ADT/BookPrinter/BookPrinterWindow.xaml

@@ -0,0 +1,45 @@
+<DefaultWindow
+            xmlns="https://spacestation14.io"
+            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+            Title="{Loc 'book-printer-title'}"
+            SetSize="525 475"
+            MinSize="525 475">
+    <BoxContainer Orientation="Vertical">
+        <ScrollContainer HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True" MinSize="0 250">
+            <BoxContainer Orientation="Vertical" Name="BooksList" Access="Public">
+            </BoxContainer>
+        </ScrollContainer>
+        <Control MinSize="0 10"/>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'book-printer-window-book-label'}"/>
+			<Control MinSize="10 0"/>
+            <Button Name="UploadButton"
+                    Access="Public"
+                    Text="{Loc 'book-printer-window-upload-button'}"
+                    StyleClasses="OpenRight"/>
+            <Button Name="ClearButton"
+                    Access="Public"
+                    Text="{Loc 'book-printer-window-clear-button'}"
+                    StyleClasses="OpenBoth"/>
+            <Button Name="CopyPasteButton"
+                    Access="Public"
+                    Text="{Loc 'book-printer-window-copy-button'}"
+                    StyleClasses="OpenBoth"/>
+            <Button Name="EjectButton"
+                    Access="Public"
+                    Text="{Loc 'book-printer-window-eject-button'}"
+                    StyleClasses="OpenLeft"/>
+        </BoxContainer>
+        <Control MinSize="0 10"/>
+            <PanelContainer SizeFlagsStretchRatio="6" MinSize="0 100">
+            <PanelContainer.PanelOverride>
+                <gfx:StyleBoxFlat BackgroundColor="#1b1b1e" />
+            </PanelContainer.PanelOverride>
+            <BoxContainer Name="ContainerInfo"
+                          Orientation="Vertical"
+                          HorizontalExpand="True">
+                <Label Text="{Loc 'book-printer-window-no-book-loaded-text'}"/>
+            </BoxContainer>
+        </PanelContainer>
+    </BoxContainer>
+</DefaultWindow>