Merge remote-tracking branch 'refs/remotes/wizards/master'

space-sunrise · Jun 11, 2024 · 5460354 · 5460354
2 parents cec93d4 + 2b28830
commit 5460354
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -389,6 +389,7 @@ public HumanoidProfileEditor(
             {
                 PreferenceUnavailableButton.SelectId(args.Id);
                 Profile = Profile?.WithPreferenceUnavailable((PreferenceUnavailableMode) args.Id);
+                SetDirty();
             };
 
             _jobCategories = new Dictionary<string, BoxContainer>();

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: RenQ
-  changes:
-  - message: brought back the classic long bedhead as an alternative to the current
-      one.
-    type: Add
-  id: 6209
-  time: '2024-03-22T17:35:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26336
 - author: metalgearsloth
   changes:
   - message: Fix NPCs getting stuck on railings.
@@ -3853,3 +3845,10 @@
   id: 6708
   time: '2024-06-10T13:20:58.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28815
+- author: Aquif
+  changes:
+  - message: It is now possible to save after chaining you job unavailable preference.
+    type: Fix
+  id: 6709
+  time: '2024-06-11T02:48:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28839
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1222,6 +1222,7 @@
     - type: StaminaDamageOnHit
       damage: 8
     - type: MeleeWeapon
+      wideAnimationRotation: -135
       damage:
         types:
           Blunt: 0

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -128,7 +128,7 @@
         shader: unshaded
         map: [ "blade" ]
   - type: MeleeWeapon
-    wideAnimationRotation: -135
+    wideAnimationRotation: 145
     attackRate: 1
     hidden: true
     damage: