Move Senior Cosmetics to Job/[department]/All Tab , Localize Senior R…

…oles in ENG (#549) * comment out senior roles until further review * removed seniors in loadouts and merge items in uncategorized * time requirements and minor cleanup * uncommented senior loadouts * reenable senior roles without localization * cleanup and bug fixes * let seniors wear their own clothes * inversion of job requirements * localization and time requirement
Fansana · Feb 15, 2025 · fc7e6ab · fc7e6ab
1 parent 88da840
commit fc7e6ab
Show file tree

Hide file tree

Showing 19 changed files with 377 additions and 147 deletions.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
@@ -4,6 +4,7 @@ job-name-cadet = Security Cadet
 job-name-hos = Head of Security
 job-name-detective = Detective
 job-name-brigmedic = Corpsman
+job-name-senior-officer = Senior Officer
 job-name-borg = Cyborg
 job-name-senior-researcher = Mystic
 job-name-scientist = Acolyte
@@ -16,9 +17,11 @@ job-name-doctor = Medical Doctor
 job-name-paramedic = Paramedic
 job-name-cmo = Chief Medical Officer
 job-name-chemist = Chemist
+job-name-senior-physician = Senior Physician
 job-name-technical-assistant = Technical Assistant
 job-name-engineer = Station Engineer
 job-name-atmostech = Atmospheric Technician
+job-name-senior-engineer = Senior Engineer
 job-name-hop = Head of Personnel
 job-name-captain = Captain
 job-name-serviceworker = Service Worker

diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml
@@ -92,3 +92,5 @@
       id: LoadingEngineeringAtmosUniformSuit
     - type: loadout
       id: LoadingEngineeringAtmosUniformSkirt
+    - type: loadout
+      id: LoadoutEngineeringClothingUniformJumpsuitAtmosCasual
diff --git a/.../Engineering/engineeringUncategorized.yml → ...Groups/Jobs/Engineering/uncategorized.yml b/.../Engineering/engineeringUncategorized.yml → ...Groups/Jobs/Engineering/uncategorized.yml
@@ -93,3 +93,7 @@
       id: LoadoutEngineeringUniformSkirt
     - type: loadout
       id: LoadoutEngineeringUniformHazard
+    - type: loadout
+      id: LoadoutEngineeringUniformJumpsuitSenior
+    - type: loadout
+      id: LoadoutEngineeringUniformJumpskirtSenior
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml
@@ -87,14 +87,20 @@
       id: LoadoutScienceOuterExplorerLabcoat
     - type: loadout
       id: LoadoutOuterRobeTechPriest
+    - type: loadout
+      id: LoadoutScienceOuterLabcoatSeniorResearcher
 
 - type: characterItemGroup
   id: LoadoutEpistemicsShoes
   items:
     - type: loadout
       id: LoadoutScienceShoesBootsWinterSci
 
-#- type: characterItemGroup
-#  id: LoadoutEpistemicsUniforms
-#  maxItems: 1
-#  items:
+- type: characterItemGroup
+  id: LoadoutEpistemicsUniforms
+  maxItems: 1
+  items:
+      - type: loadout
+        id: LoadoutScienceUniformJumpsuitSenior
+      - type: loadout
+        id: LoadoutScienceUniformJumpskirtSenior
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml
@@ -79,6 +79,8 @@
       id: LoadoutMedicalHeadSurgcapWhite
     - type: loadout
       id: LoadoutMedicalHeadSurgcapCybersun
+    - type: loadout
+      id: LoadoutMedicalHeadBeretSeniorPhysician
 
 #- type: characterItemGroup
 #  id: LoadoutMedicalId
@@ -135,3 +137,7 @@
       id: LoadoutMedicalUniformScrubsPink
     - type: loadout
       id: LoadoutMedicalUniformScrubsCybersun
+    - type: loadout
+      id: LoadoutMedicalUniformJumpskirtSenior
+    - type: loadout
+      id: LoadoutMedicalUniformJumpsuitSenior
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml
@@ -204,3 +204,7 @@
       id: LoadoutUniformJumpsuitSecFormal
     - type: loadout
       id: LoadoutUniformJumpsuitSecSummer
+    - type: loadout
+      id: LoadoutSecurityUniformJumpskirtSenior
+    - type: loadout
+      id: LoadoutSecurityUniformJumpsuitSenior
diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml
@@ -68,7 +68,7 @@
     - JobsEngineeringAAUncategorized
     - JobsEngineeringAtmosphericTechnician
     - JobsEngineeringChiefEngineer
-    - JobsEngineeringSeniorEngineer
+    - JobsEngineeringSeniorEngineer 
     - JobsEngineeringStationEngineer
     - JobsEngineeringTechnicalAssistant
 
@@ -81,8 +81,8 @@
 - type: loadoutCategory
   id: JobsEngineeringChiefEngineer
 
-- type: loadoutCategory
-  id: JobsEngineeringSeniorEngineer
+- type: loadoutCategory 
+  id: JobsEngineeringSeniorEngineer 
 
 - type: loadoutCategory
   id: JobsEngineeringStationEngineer
@@ -123,7 +123,7 @@
   id: JobsEpistemicsMystagogue
 
 - type: loadoutCategory
-  id: JobsEpistemicsMystic
+  id: JobsEpistemicsMystic #floof senior scientist
 
 - type: loadoutCategory
   id: JobsEpistemicsNoviciate

diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml
@@ -130,30 +130,30 @@
 # Shoes
 
 # Uniforms
-- type: loadout
-  id: LoadoutEngineeringUniformJumpskirtSenior
-  category: JobsEngineeringSeniorEngineer
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutSeniorEngineerUniforms
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorEngineer
-  items:
-    - ClothingUniformJumpskirtSeniorEngineer
-
-- type: loadout
-  id: LoadoutEngineeringUniformJumpsuitSenior
-  category: JobsEngineeringSeniorEngineer
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutSeniorEngineerUniforms
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorEngineer
-  items:
-    - ClothingUniformJumpsuitSeniorEngineer
+#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+#  id: LoadoutEngineeringUniformJumpskirtSenior
+#  category: JobsEngineeringSeniorEngineer
+#  cost: 0
+#  exclusive: true
+#  requirements:
+#    - !type:CharacterItemGroupRequirement
+#      group: LoadoutSeniorEngineerUniforms
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SeniorEngineer
+#  items:
+#    - ClothingUniformJumpskirtSeniorEngineer
+
+#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+#  id: LoadoutEngineeringUniformJumpsuitSenior
+#  category: JobsEngineeringSeniorEngineer
+#  cost: 0
+#  exclusive: true
+#  requirements:
+#    - !type:CharacterItemGroupRequirement
+#      group: LoadoutSeniorEngineerUniforms
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SeniorEngineer
+#  items:
+#    - ClothingUniformJumpsuitSeniorEngineer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml
@@ -255,3 +255,43 @@
         - StationEngineer
   items:
     - ClothingUniformJumpsuitEngineeringHazard
+
+- type: loadout  #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+  id: LoadoutEngineeringUniformJumpskirtSenior
+  category: JobsEngineeringAAUncategorized
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutEngineeringUniforms
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Engineering
+    - !type:CharacterJobRequirement #all engineering jobs but TA
+      inverted: true
+      jobs: [TechnicalAssistant]
+    - !type:CharacterDepartmentTimeRequirement
+      department: Engineering
+      min: 144000 #40 hours
+  items:
+    - ClothingUniformJumpskirtSeniorEngineer
+
+- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+  id: LoadoutEngineeringUniformJumpsuitSenior
+  category: JobsEngineeringAAUncategorized
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutEngineeringUniforms
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Engineering
+    - !type:CharacterJobRequirement #all engineering jobs but TA
+      inverted: true
+      jobs: [TechnicalAssistant]
+    - !type:CharacterDepartmentTimeRequirement
+      department: Engineering
+      min: 144000 #40 hours
+  items:
+    - ClothingUniformJumpsuitSeniorEngineer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml
@@ -20,47 +20,47 @@
 # Mask
 
 # Outer
-- type: loadout
-  id: LoadoutScienceOuterLabcoatSeniorResearcher
-  category: JobsEpistemicsAAUncategorized
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutMysticOuter
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorResearcher
-  items:
-    - ClothingOuterCoatLabSeniorResearcher
+#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+#  id: LoadoutScienceOuterLabcoatSeniorResearcher
+#  category: JobsEpistemicsAAUncategorized
+#  cost: 0
+#  exclusive: true
+#  requirements:
+#    - !type:CharacterItemGroupRequirement
+#      group: LoadoutMysticOuter
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SeniorResearcher
+#  items:
+#    - ClothingOuterCoatLabSeniorResearcher
 
 # Shoes
 
 # Uniforms
-- type: loadout
-  id: LoadoutScienceUniformJumpskirtSenior
-  category: JobsEpistemicsMystic
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutMysticUniforms
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorResearcher
-  items:
-    - ClothingUniformJumpskirtSeniorResearcher
+#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+#  id: LoadoutScienceUniformJumpskirtSenior
+#  category: JobsEpistemicsMystic
+#  cost: 0
+#  exclusive: true
+#  requirements:
+#    - !type:CharacterItemGroupRequirement
+#      group: LoadoutMysticUniforms
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SeniorResearcher
+#  items:
+#    - ClothingUniformJumpskirtSeniorResearcher
 
-- type: loadout
-  id: LoadoutScienceUniformJumpsuitSenior
-  category: JobsEpistemicsMystic
-  cost: 0
-  exclusive: true
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutMysticUniforms
-    - !type:CharacterJobRequirement
-      jobs:
-        - SeniorResearcher
-  items:
-    - ClothingUniformJumpsuitSeniorResearcher
+#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+#  id: LoadoutScienceUniformJumpsuitSenior
+#  category: JobsEpistemicsMystic
+#  cost: 0
+#  exclusive: true
+#  requirements:
+#    - !type:CharacterItemGroupRequirement
+#      group: LoadoutMysticUniforms
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SeniorResearcher
+#  items:
+#    - ClothingUniformJumpsuitSeniorResearcher
diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml
@@ -242,16 +242,38 @@
 
 - type: loadout
   id: LoadoutOuterRobeTechPriest
-  category: Outer
+  category: JobsEpistemicsAAUncategorized
   cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutEpistemicsOuter
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingOuterRobeTechPriest
+
+- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+  id: LoadoutScienceOuterLabcoatSeniorResearcher
+  category: JobsEpistemicsAAUncategorized
+  cost: 0
+  exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutEpistemicsOuter
     - !type:CharacterDepartmentRequirement
       departments:
         - Epistemics
+    - !type:CharacterJobRequirement #all epistemics jobs but intern
+      inverted: true
+      jobs: [ResearchAssistant]
+    - !type:CharacterDepartmentTimeRequirement
+      department: Epistemics
+      min: 144000 #40 hours
+  items:
+    - ClothingOuterCoatLabSeniorResearcher
+
 
 # Shoes
 - type: loadout
@@ -269,3 +291,42 @@
     - ClothingShoesBootsWinterSci
 
 # Uniforms
+- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+  id: LoadoutScienceUniformJumpskirtSenior
+  category: JobsEpistemicsAAUncategorized
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutEpistemicsUniforms
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
+    - !type:CharacterJobRequirement #all epistemics jobs but intern
+      inverted: true
+      jobs: [ResearchAssistant]
+    - !type:CharacterDepartmentTimeRequirement
+      department: Epistemics
+      min: 144000 #40 hours
+  items:
+    - ClothingUniformJumpskirtSeniorResearcher
+
+- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated
+  id: LoadoutScienceUniformJumpsuitSenior
+  category: JobsEpistemicsAAUncategorized
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutEpistemicsUniforms
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
+    - !type:CharacterJobRequirement #all epistemics jobs but intern
+      inverted: true
+      jobs: [ResearchAssistant]
+    - !type:CharacterDepartmentTimeRequirement
+      department: Epistemics
+      min: 144000 #40 hours
+  items:
+    - ClothingUniformJumpsuitSeniorResearcher