More.

Simple-Station · Nov 16, 2024 · 8fe5be7 · 8fe5be7
1 parent a75df80
commit 8fe5be7
Show file tree

Hide file tree

Showing 15 changed files with 263 additions and 169 deletions.
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -2289,7 +2289,11 @@ private Dictionary<string, object> CreateTree(List<LoadoutCategoryPrototype> cat
                 return match;
 
             foreach (var subcategory in parent.Contents.Where(c => c is NeoTabContainer).Cast<NeoTabContainer>())
-                match = FindCategory(id, subcategory);
+            {
+                var res = FindCategory(id, subcategory);
+                if (res != null)
+                    match ??= res;
+            }
 
             return match;
         }

diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml
@@ -1,14 +1,3 @@
-- type: characterItemGroup
-  id: LoadoutSeniorEngineerBackpack
-  maxItems: 1
-  items:
-    - type: loadout
-      id: LoadoutEngineeringSeniorEngineerBackpackBackpack
-    - type: loadout
-      id: LoadoutEngineeringSeniorEngineerBackpackSatchel
-    - type: loadout
-      id: LoadoutEngineeringSeniorEngineerBackpackDuffel
-
 - type: characterItemGroup
   id: LoadoutSeniorEngineerBelt
   maxItems: 1

diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml
@@ -0,0 +1,22 @@
+# Cataloguer
+- type: characterItemGroup
+  id: LoadoutCataloguerUniforms
+  items:
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianNt
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianIdris
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianOrion
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianHeph
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianPMCG
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianZav
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianZeng
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarian
+    - type: loadout
+      id: LoadoutScienceJumpskirtLibrarian
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml
@@ -0,0 +1,18 @@
+# Chaplain
+- type: characterItemGroup
+  id: LoadoutChaplainUniforms
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutChaplainJumpsuit
+    - type: loadout
+      id: LoadoutChaplainJumpskirt
+
+- type: characterItemGroup
+  id: LoadoutChaplainEquipment
+  maxItems: 2
+  items:
+    - type: loadout
+      id: LoadoutChaplainBible
+    - type: loadout
+      id: LoadoutChaplainStamp
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml
@@ -0,0 +1,8 @@
+- type: characterItemGroup
+  id: LoadoutGolemancerUniforms
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutScienceUniformJumpskirtRoboticist
+    - type: loadout
+      id: LoadoutScienceUniformJumpsuitRoboticist
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml
@@ -0,0 +1,56 @@
+# Mystagogue
+- type: characterItemGroup
+  id: LoadoutMystagogueBackpacks
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutMystagogueBackpacksBackpack
+    - type: loadout
+      id: LoadoutMystagogueBackpacksSatchel
+    - type: loadout
+      id: LoadoutMystagogueBackpacksDuffel
+
+- type: characterItemGroup
+  id: LoadoutMystagogueOuter
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutCommandRDOuterWinter
+    - type: loadout
+      id: LoadoutCommandRDOuterMysta
+
+- type: characterItemGroup
+  id: LoadoutMystagogueHead
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutCommandRDHeadHatBeretMysta
+    - type: loadout
+      id: LoadoutCommandRDHeadHoodMysta
+
+- type: characterItemGroup
+  id: LoadoutMystagogueNeck
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutCommandRDNeckMantle
+    - type: loadout
+      id: LoadoutCommandRDNeckCloak
+    - type: loadout
+      id: LoadoutCommandRDNeckCloakMystagogue
+
+- type: characterItemGroup
+  id: LoadoutMystagogueShoes
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutCommandRDShoesBootsWinter
+
+- type: characterItemGroup
+  id: LoadoutMystagogueUniforms
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutMystagogueUniformJumpsuit
+    - type: loadout
+      id: LoadoutMystagogueUniformJumpskirt
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml
@@ -0,0 +1,15 @@
+- type: characterItemGroup
+  id: LoadoutMysticUniforms
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutScienceUniformJumpskirtSenior
+    - type: loadout
+      id: LoadoutScienceUniformJumpsuitSenior
+
+- type: characterItemGroup
+  id: LoadoutMysticOuter
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutScienceOuterLabcoatSeniorResearcher
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml
@@ -1,14 +1,6 @@
 - type: characterItemGroup
   id: LoadoutUniformsScience
   items:
-    - type: loadout
-      id: LoadoutScienceUniformJumpskirtSenior
-    - type: loadout
-      id: LoadoutScienceUniformJumpsuitSenior
-    - type: loadout
-      id: LoadoutScienceUniformJumpskirtRoboticist
-    - type: loadout
-      id: LoadoutScienceUniformJumpsuitRoboticist
     - type: loadout
       id: LoadoutScienceUniformJumpsuitMonasticRobeDark
     - type: loadout
@@ -102,43 +94,3 @@
     - type: loadout
       id: LoadoutScienceShoesBootsWinterSci
 
-# Cataloguer
-- type: characterItemGroup
-  id: LoadoutCataloguerUniforms
-  items:
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarianNt
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarianIdris
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarianOrion
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarianHeph
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarianPMCG
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarianZav
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarianZeng
-    - type: loadout
-      id: LoadoutScienceJumpsuitLibrarian
-    - type: loadout
-      id: LoadoutScienceJumpskirtLibrarian
-
-# Chaplain
-- type: characterItemGroup
-  id: LoadoutChaplainUniforms
-  items:
-    - type: loadout
-      id: LoadoutChaplainJumpsuit
-    - type: loadout
-      id: LoadoutChaplainJumpskirt
-
-- type: characterItemGroup
-  id: LoadoutChaplainEquipment
-  maxItems: 2
-  items:
-    - type: loadout
-      id: LoadoutChaplainBible
-    - type: loadout
-      id: LoadoutChaplainStamp
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml
@@ -1,46 +1,5 @@
 # Senior Engineer
 # Backpacks
-- type: loadout
-  id: LoadoutEngineeringSeniorEngineerBackpackBackpack
-  category: JobsEngineeringStationEngineer
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutSeniorEngineerBackpack
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorEngineer
-  items:
-    - ClothingBackpackEngineeringFilled
-
-- type: loadout
-  id: LoadoutEngineeringSeniorEngineerBackpackSatchel
-  category: JobsEngineeringStationEngineer
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutSeniorEngineerBackpack
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorEngineer
-  items:
-    - ClothingBackpackSatchelEngineeringFilled
-
-- type: loadout
-  id: LoadoutEngineeringSeniorEngineerBackpackDuffel
-  category: JobsEngineeringStationEngineer
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutSeniorEngineerBackpack
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorEngineer
-  items:
-    - ClothingBackpackDuffelEngineeringFilled
 
 # Belt
 - type: loadout