diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml index 3f56b7af53..0968de0ad6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml @@ -184,6 +184,16 @@ equipment: belt: NullRod +# Job trinkets + +- type: itemLoadout # WD + id: ArmamentsBeacon + equipment: ArmamentsBeacon +- type: startingGear + id: ArmamentsBeacon + storage: + back: + - ArmamentsBeacon # PDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index db5dc71537..7a2f9244e2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -26,6 +26,16 @@ equipment: back: ClothingBackpackDuffelMusicianFilled +# Jumpsuit + +- type: itemLoadout # WD + id: MusicianJumpsuit + equipment: MusicianJumpsuit +- type: startingGear + id: MusicianJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitMusician + # Outerclothing - type: itemLoadout id: MusicianWintercoat diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 44de4e16e8..da9641d40d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -126,6 +126,14 @@ equipment: ears: ClothingHeadsetCE +- type: itemLoadout # WD + id: ChiefEngineerHeadsetAlt + equipment: ChiefEngineerHeadsetAlt +- type: startingGear + id: ChiefEngineerHeadsetAlt + equipment: + ears: ClothingHeadsetAltEngineering + # PDA - type: itemLoadout # WD id: ChiefEngineerPDA @@ -133,4 +141,4 @@ - type: startingGear id: ChiefEngineerPDA equipment: - id: EngineerPDA + id: CEPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/common.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/common.yml index 77c099a7af..4db68fcd50 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/common.yml @@ -27,3 +27,13 @@ id: MedicalMask equipment: mask: ClothingMaskSterile + +# Mask + +- type: itemLoadout + id: MedicalBeltRig + equipment: MedicalBeltRig +- type: startingGear + id: MedicalBeltRig + equipment: + belt: ClothingBeltMedicalRig diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 46bf40c15e..176fd43fde 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -321,6 +321,13 @@ loadouts: - ChaplainMask +- type: loadoutGroup # WD edit + id: ChaplainNeck + name: loadout-group-neck + loadouts: + - ChaplainNecklaceSilver + - ChaplainNeck + - type: loadoutGroup id: ChaplainJumpsuit name: loadout-group-jumpsuit @@ -356,11 +363,10 @@ - ChaplainNullRod - type: loadoutGroup # WD edit - id: ChaplainNeck - name: loadout-group-neck + id: ChaplainJobTrinkets + name: loadout-group-job-trinkets loadouts: - - ChaplainNecklaceSilver - - ChaplainNeck + - ArmamentsBeacon - type: loadoutGroup id: ChaplainPDA @@ -585,6 +591,16 @@ loadouts: - MimePDA +- type: loadoutGroup # WD + id: MusicianHead + name: loadout-group-head + loadouts: + - BowlerHat + - Tophat + - HatMagician + - BeretStandardЙ + - FrenchBeret + - type: loadoutGroup id: MusicianBackpack name: loadout-group-backpack @@ -594,6 +610,14 @@ - MusicianDuffel - CommonSatchelLeather # WD +- type: loadoutGroup # WD + id: MusicianJumpsuit + name: loadout-group-jumpsuit + loadouts: + - MusicianJumpsuit + - JumpsuitFamily + - JumpsuitLoungewear + - type: loadoutGroup id: MusicianOuterClothing name: loadout-group-outerclothing @@ -927,6 +951,7 @@ name: loadout-group-ears loadouts: - ChiefEngineerHeadset + - ChiefEngineerHeadsetAlt - type: loadoutGroup id: ChiefEngineerJumpsuit @@ -1829,6 +1854,7 @@ minLimit: 0 loadouts: - ParamedicBelt + - MedicalBeltRig - type: loadoutGroup id: ParamedicPDA @@ -1871,6 +1897,7 @@ - type: loadoutGroup id: CommonMedicalMask name: loadout-group-mask + minLimit: 0 loadouts: - MedicalMask diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 5e7ba34e32..94893b00bd 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -114,6 +114,7 @@ - ChaplainNullRod # WD - CommonShoes # WD - ChaplainPDA # WD + - ChaplainJobTrinkets # WD - Trinkets - type: roleLoadout @@ -171,17 +172,21 @@ - MimeJumpsuit - MimeBackpack - MimeOuterClothing + - CommonShoes # WD - MimePDA - Trinkets - type: roleLoadout id: JobMusician groups: - - CommonServiceHeadset # WD - - MusicianBackpack - - MusicianOuterClothing + - MusicianHead # WD - CommonGlasses # WD - - MusicianPDA + - CommonServiceHeadset # WD + - MusicianJumpsuit # WD + - MusicianOuterClothing + - MusicianBackpack + - MusicianPDA # WD + - CommonShoes # WD - Trinkets - Instruments @@ -243,7 +248,7 @@ - ChiefEngineerOuterClothing - CommonGloves # WD - ChiefEngineerShoes - - ChiefEngineerPDA + - ChiefEngineerPDA # WD - Trinkets - type: roleLoadout