Make mantles loadout only. (#30929)

* remove cloaks and mantles from dresser

* remove mantles from lathe

* add role timer loadout thing

* add back cloak dresser

* fix test fail

* potentially fix test fail (?)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index d04b6aff60aebbc187422afdeae51601fe6cccd8..febfe23ad16984dbe204190d186fd8168907fbf7 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -7,13 +7,11 @@
     contents:
       - id: ClothingHeadHatCaptain
       - id: ClothingHeadHatCapcap
-      - id: ClothingNeckCloakCap
-      - id: ClothingNeckCloakCapFormal
       - id: ClothingUniformJumpsuitCapFormal
       - id: ClothingUniformJumpskirtCapFormalDress
       - id: ClothingHandsGlovesCaptain
-      - id: ClothingNeckMantleCap
       - id: ClothingOuterWinterCap
+      - id: ClothingNeckCloakCap
 
 - type: entity
   id: DresserChiefEngineerFilled
@@ -22,12 +20,11 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckMantleCE
       - id: ClothingUniformJumpsuitChiefEngineerTurtle
       - id: ClothingUniformJumpskirtChiefEngineerTurtle
-      - id: ClothingNeckCloakCe
       - id: ClothingHeadHatBeretEngineering
       - id: ClothingOuterWinterCE
+      - id: ClothingNeckCloakCe
 
 - type: entity
   id: DresserChiefMedicalOfficerFilled
@@ -36,8 +33,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckMantleCMO
-      - id: ClothingCloakCmo
       - id: ClothingOuterCoatLabCmo
       - id: ClothingUniformJumpsuitCMOTurtle
       - id: ClothingUniformJumpskirtCMOTurtle
@@ -45,6 +40,7 @@
       - id: ClothingHeadMirror
       - id: ClothingEyesGlasses
       - id: ClothingOuterWinterCMO
+      - id: ClothingCloakCmo
 
 - type: entity
   id: DresserHeadOfPersonnelFilled
@@ -53,11 +49,10 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckMantleHOP
-      - id: ClothingNeckCloakHop
       - id: ClothingHeadHatHopcap
       - id: ClothingOuterWinterHoP
       - id: ClothingEyesGlasses
+      - id: ClothingNeckCloakHop
 
 - type: entity
   id: DresserHeadOfSecurityFilled
@@ -66,15 +61,14 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckMantleHOS
       - id: ClothingHeadHatBeretHoS
       - id: ClothingHeadHatHoshat
-      - id: ClothingNeckCloakHos
       - id: ClothingUniformJumpskirtHoSAlt
       - id: ClothingUniformJumpsuitHoSAlt
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal
       - id: ClothingOuterWinterHoS
+      - id: ClothingNeckCloakHos
 
 - type: entity
   id: DresserQuarterMasterFilled
@@ -83,14 +77,13 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakQm
       - id: ClothingHeadHatBeretQM
       - id: ClothingUniformJumpsuitQMFormal
       - id: ClothingUniformJumpsuitQMTurtleneck
       - id: ClothingUniformJumpskirtQMTurtleneck
       - id: ClothingHandsGlovesColorBrown
-      - id: ClothingNeckMantleQM
       - id: ClothingOuterWinterQM
+      - id: ClothingNeckCloakQm
 
 - type: entity
   id: DresserResearchDirectorFilled
@@ -99,13 +92,12 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckMantleRD
-      - id: ClothingNeckCloakRd
       - id: ClothingHeadHatBeretRND
       - id: ClothingHandsGlovesColorPurple
       - id: ClothingEyesGlasses
       - id: ClothingOuterWinterRD
       - id: ClothingOuterCoatRD
+      - id: ClothingNeckCloakRd
 
 - type: entity
   id: DresserWardenFilled

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 8f6fb16f046da4e58e0b0ffac7957674f3a0d387..98d5440e3ed8b086b7be068698c41767bf60b2cf 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1065,13 +1065,6 @@
       - ClothingOuterWinterWardenUnarmored
       - ClothingOuterWinterQM
       - ClothingOuterWinterRD
-      - ClothingNeckMantleCap
-      - ClothingNeckMantleCE
-      - ClothingNeckMantleCMO
-      - ClothingNeckMantleHOP
-      - ClothingNeckMantleHOS
-      - ClothingNeckMantleRD
-      - ClothingNeckMantleQM
       - ClothingOuterWinterMusician
       - ClothingOuterWinterClown
       - ClothingOuterWinterMime

diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
index ecdf1e5ffee27f3b8f7e4cdb24c32171294031d6..60fc1834fb59c177188e1e2384abbd846e70aa24 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -1,3 +1,13 @@
+# For mantles
+- type: loadoutEffectGroup
+  id: MasterQM
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobQuartermaster
+      time: 72000 #20 hrs
+
 # Jumpsuit
 - type: loadout
   id: QuartermasterJumpsuit
@@ -42,6 +52,14 @@
     neck: ClothingNeckCloakQm
 
 - type: loadout
+  id: QuartermasterMantle
+  equipment: 
+    neck: ClothingNeckMantleQM
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterQM
+
+- type: startingGear
   id: QuartermasterMantle
   equipment:
     neck: ClothingNeckMantleQM

diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
index f665038ff20ea505ef1313bb37973421e6360f35..9043354a315539a7ff860625348791906cf23913 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -1,3 +1,13 @@
+# For mantles
+- type: loadoutEffectGroup
+  id: MasterCap
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobCaptain
+      time: 72000 #20 hrs
+
 # Jumpsuit
 - type: loadout
   id: CaptainJumpsuit
@@ -45,6 +55,14 @@
   id: CaptainMantle
   equipment:
     neck: ClothingNeckMantleCap
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterCap
+
+- type: startingGear
+  id: CaptainMantle
+  equipment:
+    neck: ClothingNeckMantleCap
 
 # Back
 - type: loadout

diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
index 76c46d7d1a064616e59a54b5d0479d72184ffeb4..45223bea149b9c483e25df2bd93bd014b3303754 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -1,3 +1,13 @@
+# For mantles
+- type: loadoutEffectGroup
+  id: MasterHoP
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobHeadOfPersonnel
+      time: 72000 #20 hrs
+
 # Professional HoP Time
 - type: loadoutEffectGroup
   id: ProfessionalHoP
@@ -35,6 +45,14 @@
   id: HoPMantle
   equipment:
     neck: ClothingNeckMantleHOP
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterHoP
+
+- type: startingGear
+  id: HoPMantle
+  equipment:
+    neck: ClothingNeckMantleHOP
 
 # Back
 - type: loadout

diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
index 522f16d09e2ee02ee9af7b16d219766d165664b2..13b72e0af4f335bf2bc289d075493121b2b4acf1 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -1,3 +1,13 @@
+# For mantles
+- type: loadoutEffectGroup
+  id: MasterCE
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobChiefEngineer
+      time: 72000 #20 hrs
+
 # Jumpsuit
 - type: loadout
   id: ChiefEngineerJumpsuit
@@ -39,6 +49,14 @@
   id: ChiefEngineerMantle
   equipment:
     neck: ClothingNeckMantleCE
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterCE
+
+- type: startingGear
+  id: ChiefEngineerMantle
+  equipment:
+    neck: ClothingNeckMantleCE
 
 # OuterClothing
 - type: loadout

diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
index 12bde1be96fbe875e6bcec7ea23b9c76df1ae543..43bbc42f46e8e4d72fe509244d2e54b361d08a94 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -1,3 +1,13 @@
+# For mantles
+- type: loadoutEffectGroup
+  id: MasterCMO
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobChiefMedicalOfficer
+      time: 72000 #20 hrs
+
 # Jumpsuit
 - type: loadout
   id: ChiefMedicalOfficerJumpsuit
@@ -40,6 +50,14 @@
   id: ChiefMedicalOfficerMantle
   equipment:
     neck: ClothingNeckMantleCMO
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterCMO
+
+- type: startingGear
+  id: ChiefMedicalOfficerMantle
+  equipment:
+    neck: ClothingNeckMantleCMO
 
 # Outer clothing
 - type: loadout

diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
index c1c644de2a776fa0a4e6de6d6f1a791de1a1c644..2e607aca698f7543d42bee134162bde853231017 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -1,15 +1,31 @@
-# Head
+# For mantles
+- type: loadoutEffectGroup
+  id: MasterRD
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobResearchDirector
+      time: 72000 #20 hrs
 
+# Head
 - type: loadout
   id: ResearchDirectorBeret
   startingGear: ScientificBeret
 
 # Neck
-
 - type: loadout
   id: ResearchDirectorMantle
   equipment:
     neck: ClothingNeckMantleRD
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterRD
+
+- type: startingGear
+  id: ResearchDirectorMantle
+  equipment:
+    neck: ClothingNeckMantleRD
 
 - type: loadout
   id: ResearchDirectorCloak

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
index ceecef6cc6ecdca55d8cd131e3cc8847cf802649..a393006d9c5a8e9861468ccb78ac03a1c18b1a36 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -1,3 +1,13 @@
+# For mantles
+- type: loadoutEffectGroup
+  id: MasterHoS
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobHeadOfSecurity
+      time: 72000 #20 hrs
+
 # Jumpsuit
 - type: loadout
   id: HeadofSecurityJumpsuit
@@ -50,6 +60,14 @@
   id: HeadofSecurityMantle
   equipment:
     neck: ClothingNeckMantleHOS
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterHoS
+
+- type: startingGear
+  id: HeadofSecurityMantle
+  equipment:
+    neck: ClothingNeckMantleHOS
 
 # OuterClothing
 - type: loadout

diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index b7b6a5c1a15b655687223f2f9a146e56037ba25f..100cbe8f386fefc922caabeda75aefe11fb304ca 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -685,6 +685,7 @@
   completetime: 4
   materials:
     Cloth: 300
+
 # Command winter coats
 - type: latheRecipe
   id: ClothingOuterWinterCap
@@ -757,62 +758,7 @@
   materials:
     Cloth: 500
     Durathread: 300
-# Mantles
-- type: latheRecipe
-  id: ClothingNeckMantleCap
-  result: ClothingNeckMantleCap
-  completetime: 2.8
-  materials:
-    Cloth: 200
-    Durathread: 150
-
-- type: latheRecipe
-  id: ClothingNeckMantleCE
-  result: ClothingNeckMantleCE
-  completetime: 2.8
-  materials:
-    Cloth: 200
-    Durathread: 150
-
-- type: latheRecipe
-  id: ClothingNeckMantleCMO
-  result: ClothingNeckMantleCMO
-  completetime: 2.8
-  materials:
-    Cloth: 200
-    Durathread: 150
-
-- type: latheRecipe
-  id: ClothingNeckMantleHOP
-  result: ClothingNeckMantleHOP
-  completetime: 2.8
-  materials:
-    Cloth: 200
-    Durathread: 150
 
-- type: latheRecipe
-  id: ClothingNeckMantleHOS
-  result: ClothingNeckMantleHOS
-  completetime: 2.8
-  materials:
-    Cloth: 200
-    Durathread: 150
-
-- type: latheRecipe
-  id: ClothingNeckMantleRD
-  result: ClothingNeckMantleRD
-  completetime: 2.8
-  materials:
-    Cloth: 200
-    Durathread: 150
-
-- type: latheRecipe
-  id: ClothingNeckMantleQM
-  result: ClothingNeckMantleQM
-  completetime: 2.8
-  materials:
-    Cloth: 200
-    Durathread: 150
 # Winter coats
 - type: latheRecipe
   id: ClothingOuterWinterMusician
@@ -989,6 +935,7 @@
   materials:
     Cloth: 500
     Durathread: 200
+
 # Hats
 - type: latheRecipe
   id: ClothingHeadHatCaptain
@@ -1171,6 +1118,7 @@
   completetime: 1
   materials:
     Cloth: 100
+
 # Ties
 - type: latheRecipe
   id: ClothingNeckTieRed
@@ -1192,6 +1140,7 @@
   completetime: 2
   materials:
     Cloth: 200
+
 # Scarfs
 - type: latheRecipe
   id: ClothingNeckScarfStripedGreen
@@ -1248,6 +1197,7 @@
   completetime: 2
   materials:
     Cloth: 200
+
 # Carpets
 - type: latheRecipe
   id: Carpet