and science

metalgearsloth · Apr 4, 2024 · 0e53b46 · 0e53b46
1 parent 5c672d1
commit 0e53b46
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 11 deletions.
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -0,0 +1,82 @@
+# Head
+
+- type: loadout
+  id: ResearchDirectorBeret
+  equipment: ScientificBeret
+
+# Neck
+
+- type: loadout
+  id: ResearchDirectorMantle
+  equipment: ResearchDirectorMantle
+
+- type: startingGear
+  id: ResearchDirectorMantle
+  equipment:
+    neck: ClothingNeckMantleRD
+
+- type: loadout
+  id: ResearchDirectorCloak
+  equipment: ResearchDirectorCloak
+
+- type: startingGear
+  id: ResearchDirectorCloak
+  equipment:
+    neck: ClothingNeckCloakRd
+
+# Jumpsuit
+- type: loadout
+  id: ResearchDirectorJumpsuit
+  equipment: ResearchDirectorJumpsuit
+
+- type: startingGear
+  id: ResearchDirectorJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitResearchDirector
+
+- type: loadout
+  id: ResearchDirectorJumpskirt
+  equipment: ResearchDirectorJumpskirt
+
+- type: startingGear
+  id: ResearchDirectorJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtResearchDirector
+
+# Back
+- type: loadout
+  id: ResearchDirectorBackpack
+  equipment: ResearchDirectorBackpack
+
+- type: startingGear
+  id: ResearchDirectorBackpack
+  equipment:
+    back: ClothingBackpackResearchDirectorFilled
+
+- type: loadout
+  id: ResearchDirectorSatchel
+  equipment: ResearchDirectorSatchel
+
+- type: startingGear
+  id: ResearchDirectorSatchel
+  equipment:
+    back: ClothingBackpackSatchelResearchDirectorFilled
+
+- type: loadout
+  id: ResearchDirectorDuffel
+  equipment: ResearchDirectorDuffel
+
+- type: startingGear
+  id: ResearchDirectorDuffel
+  equipment:
+    back: ClothingBackpackDuffelResearchDirectorFilled
+
+# OuterClothing
+- type: loadout
+  id: ResearchDirectorLabCoat
+  equipment: ResearchDirectorLabCoat
+
+- type: startingGear
+  id: ResearchDirectorLabCoat
+  equipment:
+    outerClothing: ClothingOuterCoatRD
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -106,6 +106,42 @@
   - AtmosphericTechnicianDuffel
 
 # Science
+- type: loadoutGroup
+  id: ResearchDirectorHead
+  name: loadout-group-research-director-head
+  minLimit: 0
+  loadouts:
+  - ResearchDirectorBeret
+
+- type: loadoutGroup
+  id: ResearchDirectorNeck
+  name: loadout-group-research-director-neck
+  minLimit: 0
+  loadouts:
+  - ResearchDirectorMantle
+  - ResearchDirectorCloak
+
+- type: loadoutGroup
+  id: ResearchDirectorJumpsuit
+  name: loadout-group-research-director-jumpsuit
+  loadouts:
+  - ResearchDirectorJumpsuit
+  - ResearchDirectorJumpskirt
+
+- type: loadoutGroup
+  id: ResearchDirectorBackpack
+  name: loadout-group-research-director-backpack
+  loadouts:
+  - ResearchDirectorBackpack
+  - ResearchDirectorSatchel
+  - ResearchDirectorDuffel
+
+- type: loadoutGroup
+  id: ResearchDirectorOuterClothing
+  name: loadout-group-research-director-outerclothing
+  minLimit: 0
+  loadouts:
+  - ResearchDirectorLabCoat
 
 - type: loadoutGroup
   id: ScientistHead
@@ -157,6 +193,13 @@
   - ScientistPDA
   - SeniorResearcherPDA
 
+- type: loadoutGroup
+  id: ResearchAssistantJumpsuit
+  name: loadout-group-research-assistant-jumpsuit
+  loadouts:
+  - WhiteJumpsuit
+  - WhiteJumpskirt
+
 # Security
 - type: loadoutGroup
   id: SecurityHead

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -33,6 +33,16 @@
   - Trinkets
 
 # Science
+- type: roleLoadout
+  id: JobResearchDirector
+  groups:
+  - ResearchDirectorHead
+  - ResearchDirectorNeck
+  - ResearchDirectorJumpsuit
+  - ResearchDirectorBackpack
+  - ResearchDirectorOuterClothing
+  - Trinkets
+
 - type: roleLoadout
   id: JobScientist
   groups:
@@ -44,6 +54,13 @@
   - ScientistPDA
   - Trinkets
 
+- type: roleLoadout
+  id: JobResearchAssistant
+  groups:
+  - ResearchAssistantJumpsuit
+  - ScientistBackpack
+  - Trinkets
+
 # Security
 - type: roleLoadout
   id: JobSecurityOfficer

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -19,12 +19,8 @@
 - type: startingGear
   id: ResearchAssistantGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitColorWhite
     back: ClothingBackpackScienceFilled
     shoes: ClothingShoesColorWhite
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
     pocket2: BookScientistsGuidebook
-  innerClothingSkirt: ClothingUniformJumpskirtColorWhite
-  satchel: ClothingBackpackSatchelScienceFilled
-  duffelbag: ClothingBackpackDuffelScienceFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -32,12 +32,6 @@
 - type: startingGear
   id: ResearchDirectorGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitResearchDirector
-    back: ClothingBackpackResearchDirectorFilled
     shoes: ClothingShoesColorBrown
-    outerClothing: ClothingOuterCoatRD
     id: RnDPDA
-    ears: ClothingHeadsetRD
-  innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
-  satchel: ClothingBackpackSatchelResearchDirectorFilled
-  duffelbag: ClothingBackpackDuffelResearchDirectorFilled
+    ears: ClothingHeadsetRD