Merge pull request #324 from Darkmajia/loadout-extras

loadout extras + title change
impstation · Sep 22, 2024 · 5763327 · 5763327
2 parents 28d8416 + b09d672
commit 5763327
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -1008,7 +1008,7 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo
 
             _loadoutWindow = new LoadoutWindow(Profile, roleLoadout, roleLoadoutProto, _playerManager.LocalSession, collection)
             {
-                Title = jobProto?.ID + "-loadout",
+                Title = Loc.GetString(jobProto?.Name ?? "Job") + " Loadout",
             };
 
             // Refresh the buttons etc.

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -24,6 +24,12 @@
   equipment:
     eyes: ClothingEyesGlasses
 
+# Cheap sunglasses
+- type: loadout
+  id: GlassesCheapSunglasses
+  equipment:
+    eyes: ClothingEyesGlassesCheapSunglasses
+
 # Special options
 # Jamjar
 - type: loadout

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -155,3 +155,21 @@
   storage:
     back:
     - PersonalAI
+
+- type: loadout
+  id: FolderBlack
+  storage:
+    back:
+    - BoxFolderBlack
+
+- type: loadout
+  id: BarFlask
+  storage:
+    back:
+    - DrinkFlaskBar
+
+- type: loadout
+  id: NewtonCradle
+  storage:
+    back:
+    - NewtonCradle
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -17,6 +17,9 @@
   - CigarCase
   - CigarGold
   - PersonalAI
+  - FolderBlack
+  - BarFlask
+  - NewtonCradle
   - ClothingNeckLGBTPin
   - ClothingNeckAromanticPin
   - ClothingNeckAsexualPin
@@ -35,6 +38,7 @@
   minLimit: 0
   loadouts:
   - Glasses
+  - GlassesCheapSunglasses
   - GlassesJamjar
   - GlassesJensen