From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 12 Aug 2024 07:14:45 +0000 (+1000) Subject: Make mantles loadout only. (#30929) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c6209cc725f25ef9e73daa241a84c3e0ea1b822d;p=space-station-14.git 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 d04b6aff60..febfe23ad1 100644 --- 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 8f6fb16f04..98d5440e3e 100644 --- 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 ecdf1e5ffe..60fc1834fb 100644 --- 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 f665038ff2..9043354a31 100644 --- 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 76c46d7d1a..45223bea14 100644 --- 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 522f16d09e..13b72e0af4 100644 --- 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 12bde1be96..43bbc42f46 100644 --- 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 c1c644de2a..2e607aca69 100644 --- 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 ceecef6cc6..a393006d9c 100644 --- 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 b7b6a5c1a1..100cbe8f38 100644 --- 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