From bf8e9706819fda4d114ab437bb26e7e595ee36f3 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 27 Sep 2024 20:46:18 -0400 Subject: [PATCH 01/25] Backpack Loadout Category (#957) # Description https://github.com/Simple-Station/Einstein-Engines/pull/794 apparently silently deprecated the Backpack Preferences button. Selecting a backpack preference no longer actually does anything, and instead your backpack comes from your Loadout. This would have been fine if we were warned about this, but because nobody merged upstream for 2 weeks after the release of PR794, this issue went unreported. Well now the solution is going to require adding every backpack in the entire game to a new Backpacks tab. I've started this PR, but because it's really late and I have Calculus classes in the morning, I won't be able to finish it tonight. So I'm enlisting the help of a few other people I know to PR to this PR to help get the backpacks in. After we have backpacks in the loadout tab, and after Wizmerge, I'll probably do a separate PR to actually remove the now useless Backpack selection button. This is probably for the better long term. Since this technically means Backpack slots are no longer hardcoded to "Backpack/Duffelbag/Satchel", and now the back slot is freeeeee to be used for anything.

Media

![image](https://github.com/user-attachments/assets/7081660f-68f0-471e-99eb-67f026b7e122)

# Changelog :cl: - add: Backpacks, Duffelbags, and Satchels have been added to loadouts. - remove: The button for "Backpack Preference" has been removed. Backpacks selection is now done via Loadouts. - remove: The button for "Suit/Skirt Preference" has also been removed. Suit selection is done via Loadouts. --- .../Preferences/UI/HumanoidProfileEditor.xaml | 12 - .../UI/HumanoidProfileEditor.xaml.cs | 71 - ...0926173711_1984 Backpack Prefs.Designer.cs | 1815 +++++++++++++++++ .../20240926173711_1984 Backpack Prefs.cs | 22 + .../PostgresServerDbContextModelSnapshot.cs | 10 +- ...0926173707_1984 Backpack Prefs.Designer.cs | 1744 ++++++++++++++++ .../20240926173707_1984 Backpack Prefs.cs | 22 + .../SqliteServerDbContextModelSnapshot.cs | 10 +- .../Systems/CharacterRequirements.Profile.cs | 44 - .../Locale/en-US/loadouts/categories.ftl | 1 + .../Locale/en-US/loadouts/itemgroups.ftl | 1 + .../CharacterItemGroups/backpackGroups.yml | 11 + .../Loadouts/Categories/categories.yml | 6 +- Resources/Prototypes/Loadouts/backpacks.yml | 268 +++ Resources/Prototypes/Loadouts/duffelbags.yml | 234 +++ Resources/Prototypes/Loadouts/items.yml | 12 - Resources/Prototypes/Loadouts/satchels.yml | 247 +++ 17 files changed, 4378 insertions(+), 152 deletions(-) create mode 100644 Content.Server.Database/Migrations/Postgres/20240926173711_1984 Backpack Prefs.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240926173711_1984 Backpack Prefs.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240926173707_1984 Backpack Prefs.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240926173707_1984 Backpack Prefs.cs create mode 100644 Resources/Prototypes/CharacterItemGroups/backpackGroups.yml create mode 100644 Resources/Prototypes/Loadouts/backpacks.yml create mode 100644 Resources/Prototypes/Loadouts/duffelbags.yml create mode 100644 Resources/Prototypes/Loadouts/satchels.yml diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml index e7fecf81f4..0696aa3e5e 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml @@ -91,18 +91,6 @@