From f571e230378e5d5d11bcf61c4f4127b14c43e454 Mon Sep 17 00:00:00 2001 From: dffdff2423 Date: Mon, 10 Jun 2024 21:48:23 -0500 Subject: [PATCH 1/3] Enable save button on changing job unavailable preference (#28839) Enable save button on changing unavailable pref Fix an issue where the save button was disabled when just changing your job unavailable preference --- Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index 8ee25d6880..18f986fc7d 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -372,6 +372,7 @@ namespace Content.Client.Lobby.UI { PreferenceUnavailableButton.SelectId(args.Id); Profile = Profile?.WithPreferenceUnavailable((PreferenceUnavailableMode) args.Id); + SetDirty(); }; _jobCategories = new Dictionary(); From 3c2b1affeffaa89babb644d0cfa9c227f3cf0553 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 11 Jun 2024 02:49:30 +0000 Subject: [PATCH 2/3] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4baaa01919..2b334e2ec1 100644 --- 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 From 2b2883005d0765bc465bdff121d99e624a91578b Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 11 Jun 2024 07:55:37 +0200 Subject: [PATCH 3/3] Fix some wideswing animations (#28819) * Fix some wideswing animations * 2 --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 1 + Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index def1ad3b6b..86060b1bbe 100644 --- 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 index 7f593353bb..592fe56b47 100644 --- 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: