diff --git a/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl b/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl index c1545c9782..021fcb33b5 100644 --- a/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl +++ b/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl @@ -10,7 +10,7 @@ loadout-group-belt = Пояс loadout-group-gloves = Перчатки loadout-group-shoes = Ботинки loadout-group-pda = ПДА -loadout-group-job-trinkets = Уник. побрякушки +loadout-group-job-trinkets = Рабочий инвентарь loadout-group-inhand = В руках loadout-group-trinkets = Побрякушки loadout-group-instruments = Муз. инструменты diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml index a6c7cb10b9..932b5ee9a2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml @@ -32,6 +32,16 @@ equipment: head: ClothingHeadHatBeretMerc +# Ears + +- type: itemLoadout # WD + id: CargoHeadset + equipment: CargoHeadset +- type: startingGear + id: CargoHeadset + equipment: + ears: ClothingHeadsetCargo + # Eyes - type: itemLoadout # WD @@ -129,12 +139,13 @@ equipment: back: ClothingBackpackMerc -# Ears +# Job Trinkets - type: itemLoadout # WD - id: CargoHeadset - equipment: CargoHeadset + id: CargoAppraisalTool + equipment: CargoAppraisalTool - type: startingGear - id: CargoHeadset - equipment: - ears: ClothingHeadsetCargo + id: CargoAppraisalTool + storage: + back: + - AppraisalTool diff --git a/Resources/Prototypes/Loadouts/Jobs/Justice/common.yml b/Resources/Prototypes/Loadouts/Jobs/Justice/common.yml index 2cad6e6086..82a625d7d3 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Justice/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Justice/common.yml @@ -5,37 +5,42 @@ equipment: FolderBlack - type: startingGear id: FolderBlack - equipment: - id: BoxFolderBlack + storage: + back: + - BoxFolderBlack - type: itemLoadout # WD id: FolderWhite equipment: FolderWhite - type: startingGear id: FolderWhite - equipment: - id: BoxFolderWhite + storage: + back: + - BoxFolderWhite - type: itemLoadout # WD id: FolderRed equipment: FolderRed - type: startingGear id: FolderRed - equipment: - id: BoxFolderRed + storage: + back: + - BoxFolderRed - type: itemLoadout # WD id: Clipboard equipment: Clipboard - type: startingGear id: Clipboard - equipment: - id: BoxFolderClipboard + storage: + back: + - BoxFolderClipboard - type: itemLoadout # WD id: JudgeHammer equipment: JudgeHammer - type: startingGear id: JudgeHammer - equipment: - id: OmntnsHammer + storage: + back: + - OmntnsHammer diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index a02a791a71..28a6015c19 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -82,13 +82,22 @@ equipment: outerClothing: ClothingOuterCoatDetective - # Gloves -- type: itemLoadout +- type: itemLoadout # WD id: GlovesForensic equipment: GlovesForensic - type: startingGear id: GlovesForensic equipment: gloves: ClothingHandsGlovesForensic + +# PDA + +- type: itemLoadout # WD + id: DetectivePDA + equipment: DetectivePDA +- type: startingGear + id: DetectivePDA + equipment: + id: DetectivePDA diff --git a/Resources/Prototypes/Loadouts/Jobs/common.yml b/Resources/Prototypes/Loadouts/Jobs/common.yml index 931d85b89d..b51c76a769 100644 --- a/Resources/Prototypes/Loadouts/Jobs/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/common.yml @@ -173,6 +173,14 @@ equipment: gloves: ClothingHandsGlovesColorBlack +- type: itemLoadout + id: GlovesColorWhite + equipment: GlovesColorWhite +- type: startingGear + id: GlovesColorWhite + equipment: + gloves: ClothingHandsGlovesColorWhite + - type: itemLoadout id: GlovesLatex equipment: GlovesLatex diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index f90079001a..97a6baf8aa 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -595,6 +595,15 @@ loadouts: - MimeWintercoat +- type: loadoutGroup + id: MimeGloves + name: loadout-group-gloves + minLimit: 0 + loadouts: + - GlovesColorWhite + - GlovesColorBlack + - GlovesFingerless + - type: loadoutGroup # WD id: MimePDA name: loadout-group-pda @@ -949,11 +958,20 @@ - SalvagePDA - type: loadoutGroup # WD - id: CommonCargoEars + id: CommonCargoHeadset name: loadout-group-ears loadouts: - CargoHeadset +- type: loadoutGroup # WD + id: CommonCargoJobTrinkets + name: loadout-group-job-trinkets + minLimit: 0 + maxLimit: 2 + loadouts: + - CargoAppraisalTool + - Clipboard + # Engineering - type: loadoutGroup id: ChiefEngineerHead @@ -1518,6 +1536,12 @@ - ShoesLeather - BootsJack +- type: loadoutGroup # WD + id: DetectivePDA + name: loadout-group-pda + loadouts: + - DetectivePDA + - type: loadoutGroup id: SecurityCadetJumpsuit name: loadout-group-jumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 1fc85efb52..f14a9b5069 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -173,6 +173,7 @@ - MimeJumpsuit - MimeBackpack - MimeOuterClothing + - MimeGloves # WD - CommonShoes # WD - MimePDA - Trinkets @@ -205,13 +206,14 @@ - CommonGloves # WD - QuartermasterShoes - QuartermasterPDA # WD + - CommonCargoJobTrinkets - Trinkets - type: roleLoadout id: JobCargoTechnician groups: - CargoTechnicianHead - - CommonCargoEars # WD + - CommonCargoHeadset # WD - CommonGlasses # WD - CargoTechnicianJumpsuit - CargoTechnicianBackpack @@ -219,6 +221,7 @@ - CommonGloves # WD - CargoTechnicianShoes - CargoTechnicianPDA + - CommonCargoJobTrinkets - Trinkets - type: roleLoadout @@ -435,6 +438,7 @@ - DetectiveOuterClothing - DetectiveGloves - DetectiveShoes + - DetectivePDA # WD - Trinkets - type: roleLoadout