Merge branch 'master' of https://github.com/space-wizards/space-stati…

…on-14
Aidenkrz · Oct 10, 2024 · e5d49cf · e5d49cf
2 parents 1fd71c0 + ac16a05
commit e5d49cf
Show file tree

Hide file tree

Showing 197 changed files with 26,021 additions and 33,579 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 10 * * *'
-    
+
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -98,7 +98,7 @@ public void UpdateMenu()
                 }
             }
 
-            if (EntMan.TryGetComponent<HandsComponent>(Owner, out var handsComp))
+            if (EntMan.TryGetComponent<HandsComponent>(Owner, out var handsComp) && handsComp.CanBeStripped)
             {
                 // good ol hands shit code. there is a GuiHands comparer that does the same thing... but these are hands
                 // and not gui hands... which are different...

diff --git a/Content.Client/Movement/Systems/WaddleAnimationSystem.cs b/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -319,6 +319,8 @@ protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
 
         private void RunOnSaved()
         {
+            // Prevent further saving while text processing still in
+            SaveButton.Disabled = true;
             OnSaved?.Invoke(Rope.Collapse(Input.TextRope));
         }