diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index fb823fdcb9..944a970b5f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -9,11 +9,13 @@ id: CargoTechnicianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCargo + groupBy: "jumpsuit" #DeltaV - type: loadout id: CargoTechnicianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCargo + groupBy: "jumpskirt" #DeltaV # Back - type: loadout @@ -36,9 +38,11 @@ id: CargoTechnicianWintercoat equipment: outerClothing: ClothingOuterWinterCargo + groupBy: "wintercoat" #DeltaV # Shoes - type: loadout id: CargoWinterBoots equipment: shoes: ClothingShoesBootsWinterCargo + groupBy: "winterboots" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index 9501aa0409..3414bc015d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -2,7 +2,7 @@ #- type: loadoutEffectGroup # Delta-V - No time requirements # id: MasterQM # effects: -# - !type:JobRequirementLoadoutEffect +# - !type:JobRequirementLoadoutEffect # requirement: # !type:RoleTimeRequirement # role: JobQuartermaster @@ -13,26 +13,31 @@ id: QuartermasterJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitQM + groupBy: "jumpsuit" #DeltaV - type: loadout id: QuartermasterJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtQM + groupBy: "jumpskirt" #DeltaV - type: loadout id: QuartermasterTurtleneck equipment: jumpsuit: ClothingUniformJumpsuitQMTurtleneck + groupBy: "jumpsuit" #DeltaV - type: loadout id: QuartermasterTurtleneckSkirt equipment: jumpsuit: ClothingUniformJumpskirtQMTurtleneck + groupBy: "jumpskirt" #DeltaV - type: loadout id: QuartermasterFormalSuit equipment: jumpsuit: ClothingUniformJumpsuitQMFormal + groupBy: "jumpsuit" #DeltaV # Head - type: loadout @@ -69,3 +74,4 @@ id: QuartermasterWintercoat equipment: outerClothing: ClothingOuterWinterQM + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index 5ca110b5fc..15c98e1368 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -19,6 +19,7 @@ id: SalvageSpecialistWintercoat equipment: outerClothing: ClothingOuterWinterMiner + groupBy: "wintercoat" #DeltaV # Shoes - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index b8a8744915..bac640b768 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -23,16 +23,19 @@ id: BartenderJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitBartender + groupBy: "jumpsuit" #DeltaV - type: loadout id: BartenderJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtBartender + groupBy: "jumpskirt" #DeltaV - type: loadout id: BartenderJumpsuitPurple equipment: jumpsuit: ClothingUniformJumpsuitBartenderPurple + groupBy: "jumpsuit" #DeltaV # Outer clothing - type: loadout @@ -49,6 +52,7 @@ id: BartenderWintercoat equipment: outerClothing: ClothingOuterWinterBar + groupBy: "wintercoat" #DeltaV # Misc - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml index 95838d7241..dc57507f3c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml @@ -14,16 +14,19 @@ id: BotanistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitHydroponics + groupBy: "jumpsuit" #DeltaV - type: loadout id: BotanistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtHydroponics + groupBy: "jumpskirt" #DeltaV - type: loadout id: BotanistOveralls equipment: jumpsuit: ClothingUniformOveralls + groupBy: "jumpsuit" #DeltaV # Back - type: loadout @@ -51,3 +54,4 @@ id: BotanistWintercoat equipment: outerClothing: ClothingOuterWinterHydro + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml index 0bfc99d41f..d27b4fca45 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml @@ -65,21 +65,25 @@ id: ChaplainJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChaplain + groupBy: "jumpsuit" #DeltaV - type: loadout id: ChaplainJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChaplain + groupBy: "jumpskirt" #DeltaV - type: loadout id: ChaplainRobesDark equipment: jumpsuit: ClothingUniformJumpsuitMonasticRobeDark + groupBy: "robes" #DeltaV - type: loadout id: ChaplainRobesLight equipment: jumpsuit: ClothingUniformJumpsuitMonasticRobeLight + groupBy: "robes" #DeltaV # Neck - type: loadout @@ -132,7 +136,7 @@ storage: back: - BibleNanoTrasen - + - type: loadout id: BibleNarsie storage: diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 5cfa76d4a7..846d0a2015 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -15,11 +15,13 @@ id: ChefJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChef + groupBy: "jumpsuit" #DeltaV - type: loadout id: ChefJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChef + groupBy: "jumpskirt" #DeltaV # Outer clothing - type: loadout @@ -36,3 +38,4 @@ id: ChefWintercoat equipment: outerClothing: ClothingOuterWinterChef + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml index 6503667798..419edaf24e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml @@ -14,16 +14,19 @@ id: ClownSuit equipment: jumpsuit: ClothingUniformJumpsuitClown + groupBy: "jumpsuit" #DeltaV - type: loadout id: JesterSuit equipment: jumpsuit: ClothingUniformJumpsuitJester + groupBy: "jumpsuit" #DeltaV - type: loadout id: JesterAltSuit equipment: jumpsuit: ClothingUniformJumpsuitJesterAlt + groupBy: "jumpsuit" #DeltaV # Back - type: loadout @@ -62,3 +65,4 @@ id: ClownWintercoat equipment: outerClothing: ClothingOuterWinterClown + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index 8d9e032f1e..51577cd3b8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -18,27 +18,32 @@ id: JanitorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitJanitor + groupBy: "jumpsuit" #DeltaV - type: loadout id: JanitorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtJanitor + groupBy: "jumpskirt" #DeltaV # Gloves - type: loadout id: JanitorRubberGloves equipment: gloves: ClothingHandsGlovesJanitor + groupBy: "glove" #DeltaV - type: loadout id: OrangeGloves equipment: gloves: ClothingHandsGlovesColorOrange + groupBy: "glove" #DeltaV - type: loadout id: PurpleGloves equipment: gloves: ClothingHandsGlovesColorPurple + groupBy: "glove" #DeltaV # Outer clothing @@ -46,3 +51,4 @@ id: JanitorWintercoat equipment: outerClothing: ClothingOuterWinterJani + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml index cdc60bb61d..9cdf6faa67 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml @@ -3,51 +3,61 @@ id: LawyerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlack + groupBy: "jumpsuit" #DeltaV - type: loadout id: LawyerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtLawyerBlack + groupBy: "jumpskirt" #DeltaV - type: loadout id: LawyerJumpsuitBlue equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlue + groupBy: "jumpsuit" #DeltaV - type: loadout id: LawyerJumpskirtBlue equipment: jumpsuit: ClothingUniformJumpskirtLawyerBlue + groupBy: "jumpskirt" #DeltaV - type: loadout id: LawyerJumpsuitPurple equipment: jumpsuit: ClothingUniformJumpsuitLawyerPurple + groupBy: "jumpsuit" #DeltaV - type: loadout id: LawyerJumpskirtPurple equipment: jumpsuit: ClothingUniformJumpskirtLawyerPurple + groupBy: "jumpskirt" #DeltaV - type: loadout id: LawyerJumpsuitRed equipment: jumpsuit: ClothingUniformJumpsuitLawyerRed + groupBy: "jumpsuit" #DeltaV - type: loadout id: LawyerJumpskirtRed equipment: jumpsuit: ClothingUniformJumpskirtLawyerRed + groupBy: "jumpskirt" #DeltaV - type: loadout id: LawyerJumpsuitGood equipment: jumpsuit: ClothingUniformJumpsuitLawyerGood + groupBy: "jumpsuit" #DeltaV - type: loadout id: LawyerJumpskirtGood equipment: jumpsuit: ClothingUniformJumpskirtLawyerGood + groupBy: "jumpskirt" #DeltaV # Neck - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml index a4b58914df..666efd9f6e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml @@ -3,18 +3,22 @@ id: LibrarianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitLibrarian + groupBy: "jumpsuit" #DeltaV - type: loadout id: LibrarianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtLibrarian + groupBy: "jumpskirt" #DeltaV - type: loadout id: CuratorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCurator + groupBy: "jumpsuit" #DeltaV - type: loadout id: CuratorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCurator + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml index f5c78f3c17..18f94a2e14 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml @@ -35,11 +35,13 @@ id: MimeJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitMime + groupBy: "jumpsuit" #DeltaV - type: loadout id: MimeJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMime + groupBy: "jumpskirt" #DeltaV # Back - type: loadout @@ -62,6 +64,7 @@ id: MimeWintercoat equipment: outerClothing: ClothingOuterWinterMime + groupBy: "wintercoat" #DeltaV # Belt - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index 2d3e6bd0fe..67ca92c1c7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -3,14 +3,17 @@ id: MusicianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitMusician + groupBy: "jumpsuit" #DeltaV - type: loadout id: MusicianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMusician + groupBy: "jumpskirt" #DeltaV # Outerclothing - type: loadout id: MusicianWintercoat equipment: outerClothing: ClothingOuterWinterMusician + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index 1ed5e8aca0..f78c18cc1b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -33,11 +33,13 @@ id: GreyJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorGrey + groupBy: "jumpsuit" #DeltaV - type: loadout id: GreyJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorGrey + groupBy: "jumpskirt" #DeltaV # Rainbow - type: loadout @@ -47,6 +49,7 @@ proto: GreyTider equipment: jumpsuit: ClothingUniformColorRainbow + groupBy: "jumpsuit" #DeltaV # Rainbow Jumpskirt - type: loadout @@ -56,6 +59,7 @@ proto: GreyTider equipment: jumpsuit: ClothingUniformJumpskirtColorRainbow + groupBy: "jumpskirt" #DeltaV # Ancient - type: loadout @@ -110,14 +114,17 @@ id: PassengerWintercoat equipment: outerClothing: ClothingOuterWinterCoat + groupBy: "wintercoat" #DeltaV # Shoes - type: loadout id: BlackShoes equipment: shoes: ClothingShoesColorBlack + groupBy: "coloredshoe" #DeltaV - type: loadout id: WinterBoots equipment: shoes: ClothingShoesBootsWinter + groupBy: "winterboots" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 2781a772a2..3865c258fe 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -1,7 +1,7 @@ # For mantles #- type: loadoutEffectGroup # DeltaV - No time requirement # id: MasterCap -# effects: +# effects: # - !type:JobRequirementLoadoutEffect # requirement: # !type:RoleTimeRequirement @@ -13,21 +13,25 @@ id: CaptainJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCaptain + groupBy: "jumpsuit" #DeltaV - type: loadout id: CaptainJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCaptain + groupBy: "jumpskirt" #DeltaV - type: loadout id: CaptainFormalSuit equipment: jumpsuit: ClothingUniformJumpsuitCapFormal + groupBy: "jumpsuit" #DeltaV - type: loadout id: CaptainFormalSkirt equipment: jumpsuit: ClothingUniformJumpskirtCapFormalDress + groupBy: "jumpskirt" #DeltaV # Head - type: loadout @@ -77,3 +81,4 @@ id: CaptainWintercoat equipment: outerClothing: ClothingOuterWinterCap + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 24b97a187c..3ecdbd7a50 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -1,7 +1,7 @@ # For mantles #- type: loadoutEffectGroup # DeltaV - No time requirement # id: MasterHoP -# effects: +# effects: # - !type:JobRequirementLoadoutEffect # requirement: # !type:RoleTimeRequirement @@ -23,11 +23,13 @@ id: HoPJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitHoP + groupBy: "jumpsuit" #DeltaV - type: loadout id: HoPJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtHoP + groupBy: "jumpskirt" #DeltaV # Head - type: loadout @@ -65,3 +67,4 @@ id: HoPWintercoat equipment: outerClothing: ClothingOuterWinterHoP + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml index b3f1ae3cd6..42016496ca 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -3,16 +3,19 @@ id: AtmosphericTechnicianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitAtmos + groupBy: "jumpsuit" #DeltaV - type: loadout id: AtmosphericTechnicianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtAtmos + groupBy: "jumpskirt" #DeltaV - type: loadout id: AtmosphericTechnicianJumpsuitCasual equipment: jumpsuit: ClothingUniformJumpsuitAtmosCasual + groupBy: "jumpsuit" #DeltaV # Back - type: loadout @@ -35,9 +38,11 @@ id: AtmosphericTechnicianWintercoat equipment: outerClothing: ClothingOuterWinterAtmos + groupBy: "wintercoat" #DeltaV # Shoes - type: loadout id: WhiteShoes equipment: shoes: ClothingShoesColorWhite + groupBy: "coloredshoe" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 68de34ab06..301168cfea 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -1,7 +1,7 @@ # For mantles #- type: loadoutEffectGroup # DeltaV - No time requirement # id: MasterCE -# effects: +# effects: # - !type:JobRequirementLoadoutEffect # requirement: # !type:RoleTimeRequirement @@ -13,21 +13,25 @@ id: ChiefEngineerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChiefEngineer + groupBy: "jumpsuit" #DeltaV - type: loadout id: ChiefEngineerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChiefEngineer + groupBy: "jumpskirt" #DeltaV - type: loadout id: ChiefEngineerTurtleneck equipment: jumpsuit: ClothingUniformJumpsuitChiefEngineerTurtle + groupBy: "jumpsuit" #DeltaV - type: loadout id: ChiefEngineerTurtleneckSkirt equipment: jumpsuit: ClothingUniformJumpskirtChiefEngineerTurtle + groupBy: "jumpskirt" #DeltaV # Head - type: loadout @@ -55,14 +59,17 @@ id: ChiefEngineerWintercoat equipment: outerClothing: ClothingOuterWinterCE + groupBy: "wintercoat" #DeltaV # Shoes - type: loadout id: BrownShoes equipment: shoes: ClothingShoesColorBrown + groupBy: "coloredshoe" #DeltaV - type: loadout id: ChiefEngineerWinterBoots equipment: shoes: ClothingShoesBootsWinterChiefEngineer + groupBy: "winterboots" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index cba1288d11..0eacfafa77 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -52,16 +52,19 @@ id: StationEngineerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitEngineering + groupBy: "jumpsuit" #DeltaV - type: loadout id: StationEngineerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtEngineering + groupBy: "jumpskirt" #DeltaV - type: loadout id: StationEngineerHazardsuit equipment: jumpsuit: ClothingUniformJumpsuitEngineeringHazard + groupBy: "jumpsuit" #DeltaV - type: loadout id: SeniorEngineerJumpsuit @@ -111,6 +114,7 @@ id: EngineeringWinterBoots equipment: shoes: ClothingShoesBootsWinterEngi + groupBy: "winterboots" #DeltaV # ID - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml index 2a2c16a6dd..29bf511991 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml @@ -3,8 +3,10 @@ id: YellowJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorYellow + groupBy: "jumpsuit" #DeltaV - type: loadout id: YellowJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorYellow + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index 111af7b35a..6fe0cb1b61 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -3,11 +3,13 @@ id: ChemistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChemistry + groupBy: "jumpsuit" #DeltaV - type: loadout id: ChemistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChemistry + groupBy: "jumpskirt" #DeltaV # Back - type: loadout @@ -30,8 +32,10 @@ id: ChemistLabCoat equipment: outerClothing: ClothingOuterCoatLabChem + groupBy: "labcoat" #DeltaV - type: loadout id: ChemistWintercoat equipment: outerClothing: ClothingOuterWinterChem + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index 4f216fefe4..3a9baddef2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -13,21 +13,25 @@ id: ChiefMedicalOfficerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCMO + groupBy: "jumpsuit" #DeltaV - type: loadout id: ChiefMedicalOfficerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCMO + groupBy: "jumpskirt" #DeltaV - type: loadout id: ChiefMedicalOfficerTurtleneckJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCMOTurtle + groupBy: "jumpsuit" #DeltaV - type: loadout id: ChiefMedicalOfficerTurtleneckJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCMOTurtle + groupBy: "jumpskirt" #DeltaV # Head - type: loadout @@ -56,8 +60,10 @@ id: ChiefMedicalOfficerLabCoat equipment: outerClothing: ClothingOuterCoatLabCmo + groupBy: "labcoat" #DeltaV - type: loadout id: ChiefMedicalOfficerWintercoat equipment: outerClothing: ClothingOuterWinterCMO + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index d02b162483..a0fad8c3c5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -56,16 +56,19 @@ id: BlueSurgeryCap equipment: head: ClothingHeadHatSurgcapBlue + groupBy: "scrubs" #DeltaV - type: loadout id: GreenSurgeryCap equipment: head: ClothingHeadHatSurgcapGreen + groupBy: "scrubs" #DeltaV - type: loadout id: PurpleSurgeryCap equipment: head: ClothingHeadHatSurgcapPurple + groupBy: "scrubs" #DeltaV - type: loadout id: NurseHat @@ -77,11 +80,13 @@ id: MedicalDoctorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitMedicalDoctor + groupBy: "jumpsuit" #DeltaV - type: loadout id: MedicalDoctorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMedicalDoctor + groupBy: "jumpskirt" #DeltaV - type: loadout id: SeniorPhysicianJumpsuit @@ -90,6 +95,7 @@ proto: SeniorPhysician equipment: jumpsuit: ClothingUniformJumpsuitSeniorPhysician + groupBy: "jumpsuit" #DeltaV - type: loadout id: SeniorPhysicianJumpskirt @@ -98,21 +104,25 @@ proto: SeniorPhysician equipment: jumpsuit: ClothingUniformJumpskirtSeniorPhysician + groupBy: "jumpskirt" #DeltaV - type: loadout id: MedicalBlueScrubs equipment: jumpsuit: UniformScrubsColorBlue + groupBy: "scrubs" #DeltaV - type: loadout id: MedicalGreenScrubs equipment: jumpsuit: UniformScrubsColorGreen + groupBy: "scrubs" #DeltaV - type: loadout id: MedicalPurpleScrubs equipment: jumpsuit: UniformScrubsColorPurple + groupBy: "scrubs" #DeltaV # Back - type: loadout @@ -135,6 +145,7 @@ id: MedicalDoctorWintercoat equipment: outerClothing: ClothingOuterWinterMed + groupBy: "wintercoat" #DeltaV - type: loadout id: SeniorPhysicianLabCoat @@ -143,12 +154,14 @@ proto: SeniorPhysician equipment: outerClothing: ClothingOuterCoatLabSeniorPhysician + groupBy: "labcoat" #DeltaV # Shoes - type: loadout id: MedicalWinterBoots equipment: shoes: ClothingShoesBootsWinterMed + groupBy: "winterboots" #DeltaV # ID - type: loadout @@ -169,6 +182,7 @@ id: NitrileGloves equipment: gloves: ClothingHandsGlovesNitrile + groupBy: "glove" #DeltaV #Masks - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml index 94741f6d6f..81cab6f3ba 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml @@ -4,8 +4,10 @@ id: WhiteJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorWhite + groupBy: "jumpsuit" #DeltaV - type: loadout id: WhiteJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorWhite + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index 1cfe227872..faae9ede4c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -9,11 +9,13 @@ id: ParamedicJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitParamedic + groupBy: "jumpsuit" #DeltaV - type: loadout id: ParamedicJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtParamedic + groupBy: "jumpskirt" #DeltaV # Outer clothing - type: loadout @@ -25,9 +27,11 @@ id: ParamedicWintercoat equipment: outerClothing: ClothingOuterWinterPara + groupBy: "wintercoat" #DeltaV # Shoes - type: loadout id: BlueShoes equipment: shoes: ClothingShoesColorBlue + groupBy: "coloredshoe" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index ff687ef18e..488b00df51 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -2,7 +2,7 @@ #- type: loadoutEffectGroup # DeltaV - No time requirement # id: MasterRD # effects: -# - !type:JobRequirementLoadoutEffect +# - !type:JobRequirementLoadoutEffect # requirement: # !type:RoleTimeRequirement # role: JobResearchDirector @@ -31,19 +31,23 @@ id: ResearchDirectorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitResearchDirector + groupBy: "jumpsuit" #DeltaV - type: loadout id: ResearchDirectorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtResearchDirector + groupBy: "jumpskirt" #DeltaV # OuterClothing - type: loadout id: ResearchDirectorLabCoat equipment: outerClothing: ClothingOuterCoatRD + groupBy: "labcoat" #DeltaV - type: loadout id: ResearchDirectorWintercoat equipment: outerClothing: ClothingOuterWinterRD + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index 93cfcc3be8..5dcf7260fc 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -31,6 +31,7 @@ id: SkullBandana equipment: head: ClothingHeadBandSkull + groupBy: "headband" # Neck @@ -38,12 +39,14 @@ id: ScientistTie equipment: neck: ClothingNeckTieSci + groupBy: "necktie" #DeltaV # Jumpsuit - type: loadout id: ScientistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitScientist + groupBy: "jumpsuit" #DeltaV - type: loadout id: ScientistJumpskirt @@ -54,11 +57,13 @@ id: RoboticistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitRoboticist + groupBy: "jumpsuit" #DeltaV - type: loadout id: RoboticistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtRoboticist + groupBy: "jumpskirt" #DeltaV - type: loadout id: SeniorResearcherJumpsuit @@ -67,6 +72,7 @@ proto: SeniorResearcher equipment: jumpsuit: ClothingUniformJumpsuitSeniorResearcher + groupBy: "jumpsuit" #DeltaV - type: loadout id: SeniorResearcherJumpskirt @@ -75,6 +81,7 @@ proto: SeniorResearcher equipment: jumpsuit: ClothingUniformJumpskirtSeniorResearcher + groupBy: "jumpskirt" #DeltaV # Back - type: loadout @@ -97,26 +104,31 @@ id: RegularLabCoat equipment: outerClothing: ClothingOuterCoatLab + groupBy: "labcoat" #DeltaV - type: loadout id: ScienceLabCoat equipment: outerClothing: ClothingOuterCoatRnd + groupBy: "labcoat" #DeltaV - type: loadout id: ScienceWintercoat equipment: outerClothing: ClothingOuterWinterSci + groupBy: "wintercoat" #DeltaV - type: loadout id: RoboticistLabCoat equipment: outerClothing: ClothingOuterCoatRobo + groupBy: "labcoat" #DeltaV - type: loadout id: RoboticistWintercoat equipment: outerClothing: ClothingOuterWinterRobo + groupBy: "wintercoat" #DeltaV - type: loadout id: SeniorResearcherLabCoat @@ -125,23 +137,27 @@ proto: SeniorResearcher equipment: outerClothing: ClothingOuterCoatLabSeniorResearcher + groupBy: "labcoat" #DeltaV # Gloves - type: loadout id: LatexGloves equipment: gloves: ClothingHandsGlovesLatex + groupBy: "glove" #DeltaV - type: loadout id: RobohandsGloves equipment: gloves: ClothingHandsGlovesRobohands + groupBy: "glove" #DeltaV # Shoes - type: loadout id: ScienceWinterBoots equipment: shoes: ClothingShoesBootsWinterSci + groupBy: "winterboots" #DeltaV # ID - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index e8afa5a203..e798f394a5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -14,27 +14,32 @@ id: DetectiveTie equipment: neck: ClothingNeckTieDet + groupBy: "necktie" #DeltaV # Jumpsuit - type: loadout id: DetectiveJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitDetective + groupBy: "jumpsuit" #DeltaV - type: loadout id: DetectiveJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtDetective + groupBy: "jumpskirt" #DeltaV - type: loadout id: NoirJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitDetectiveGrey + groupBy: "jumpsuit" #DeltaV - type: loadout id: NoirJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtDetectiveGrey + groupBy: "jumpskirt" #DeltaV # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index c815a5b197..2483de35af 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -85,3 +85,4 @@ #End DeltaV additions equipment: outerClothing: ClothingOuterWinterHoS + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml index 94f889fc79..1f63d9a974 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml @@ -3,8 +3,10 @@ id: RedJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorRed + groupBy: "jumpsuit" #DeltaV - type: loadout id: RedJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorRed + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index f120bcb44d..1512910635 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -34,21 +34,25 @@ id: SecurityJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitSec + groupBy: "jumpsuit" #DeltaV - type: loadout id: SecurityJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtSec + groupBy: "jumpskirt" #DeltaV - type: loadout id: SecurityJumpsuitGrey equipment: jumpsuit: ClothingUniformJumpsuitSecGrey + groupBy: "jumpsuit" #DeltaV - type: loadout id: SecurityJumpskirtGrey equipment: jumpsuit: ClothingUniformJumpskirtSecGrey + groupBy: "jumpskirt" #DeltaV - type: loadout id: SeniorOfficerJumpsuit @@ -57,6 +61,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpsuitSeniorOfficer + groupBy: "jumpsuit" #DeltaV - type: loadout id: SeniorOfficerJumpskirt @@ -65,6 +70,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpskirtSeniorOfficer + groupBy: "jumpskirt" #DeltaV # Back - type: loadout @@ -108,6 +114,7 @@ id: SecurityOfficerWintercoat equipment: outerClothing: ClothingOuterWinterSec + groupBy: "wintercoat" #DeltaV # Shoes - type: loadout @@ -124,6 +131,7 @@ id: SecurityWinterBoots equipment: shoes: ClothingShoesBootsWinterSecFilled + groupBy: "winterboots" #DeltaV # PDA - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index e15120a8a8..12bc849796 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -14,11 +14,13 @@ id: WardenJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitWarden + groupBy: "jumpsuit" #DeltaV - type: loadout id: WardenJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtWarden + groupBy: "jumpskirt" #DeltaV # OuterClothing - type: loadout @@ -37,3 +39,4 @@ time: 72000 # 20hr equipment: outerClothing: ClothingOuterWinterWarden + groupBy: "wintercoat" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml index bc4bae3858..7cda07fc38 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml @@ -3,8 +3,10 @@ id: PsychologistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitPsychologist + groupBy: "jumpsuit" #DeltaV - type: loadout id: PsychologistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtPsychologist + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml index 5dfb131988..abec8ab6f0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml @@ -3,8 +3,10 @@ id: ReporterJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitReporter + groupBy: "jumpsuit" #DeltaV - type: loadout id: JournalistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitJournalist + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 17bd416c81..7bfb1aa4ca 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -34,12 +34,14 @@ storage: back: - PlushieLizard + groupBy: "plushie" #DeltaV - type: loadout id: PlushieSpaceLizard storage: back: - PlushieSpaceLizard + groupBy: "plushie" #DeltaV - type: loadout id: ThreeCandles diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml index 2f28abe732..e95996649f 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -3,16 +3,19 @@ id: ClothingUniformJumpsuitCargoTechOveralls equipment: jumpsuit: ClothingUniformJumpsuitCargoTechOveralls + groupBy: "jumpsuit" - type: loadout id: ClothingUniformJumpsuitCargoTechPants equipment: jumpsuit: ClothingUniformJumpsuitCargoTechPants + groupBy: "jumpsuit" - type: loadout id: ClothingUniformJumpskirtCargoTechRomper equipment: jumpsuit: ClothingUniformJumpskirtCargoTechRomper + groupBy: "jumpskirt" # PDA - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml index 3cf896b1e8..f6b4148408 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/courier.yml @@ -9,11 +9,13 @@ id: CourierJumpsuit equipment: jumpsuit: ClothingUniformCourier + groupBy: "jumpsuit" - type: loadout id: CourierJumpskirt equipment: jumpsuit: ClothingUniformSkirtCourier + groupBy: "jumpskirt" # Backpack - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml index 9c6413d66d..6fd8a78993 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml @@ -3,6 +3,7 @@ id: QuartermasterFormalDress equipment: jumpsuit: ClothingUniformJumpskirtQMFormal + groupBy: "jumpskirt" # Head - type: loadout @@ -15,9 +16,10 @@ id: QuartermasterLongcoat equipment: outerClothing: ClothingLongcoatQM - + groupBy: "longcoat" # Shoes - type: loadout id: QuartermasterWinterBoots equipment: shoes: ClothingShoesBootsWinterLogisticsOfficer + groupBy: "winterboots" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml index aa6415f4d9..482f269fbc 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -30,6 +30,7 @@ id: SalvageWinterBoots equipment: shoes: ClothingShoesBootsWinterMiner + groupBy: "winterboots" # Neck - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/botanist.yml index 13d55edb9e..ee5837157f 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/botanist.yml @@ -3,3 +3,4 @@ id: BotanistJumpskirtOveralls equipment: jumpsuit: ClothingUniformJumpskirtOveralls + groupBy: "jumpskirt" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml index 3372f73f71..386721ce93 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml @@ -9,6 +9,7 @@ id: MimeWintercoatLong equipment: outerClothing: ClothingOuterWinterLongMime + groupBy: "wintercoat" # Mask - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml index 229e8ef8a9..a3bdb89cc1 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml @@ -32,42 +32,49 @@ id: BlackBandana equipment: head: ClothingHeadBandBlack + groupBy: "headband" ## Blue Bandana Head - type: loadout id: BlueBandana equipment: head: ClothingHeadBandBlue + groupBy: "headband" ## Gold Bandana Head - type: loadout id: GoldBandana equipment: head: ClothingHeadBandGold + groupBy: "headband" ## Green Bandana Head - type: loadout id: GreenBandana equipment: head: ClothingHeadBandGreen + groupBy: "headband" ## Grey Bandana Head - type: loadout id: GreyBandana equipment: head: ClothingHeadBandGrey + groupBy: "headband" ## Red Bandana Head - type: loadout id: RedBandana equipment: head: ClothingHeadBandRed + groupBy: "headband" ## Brown Bandana Head - type: loadout id: BrownBandana equipment: head: ClothingHeadBandBrown + groupBy: "headband" ## Beret - type: loadout @@ -80,84 +87,98 @@ id: BrownFedora equipment: head: ClothingHeadHatFedoraBrown + groupBy: "fedora" ## Grey Fedora - type: loadout id: GreyFedora equipment: head: ClothingHeadHatFedoraGrey + groupBy: "fedora" ## Black Fedora - type: loadout id: BlackFedora equipment: head: ClothingHeadHatFedoraBlack + groupBy: "fedora" ## Chocolate Fedora - type: loadout id: ChocFedora equipment: head: ClothingHeadHatFedoraChoc + groupBy: "fedora" ## White Fedora - type: loadout id: WhiteFedora equipment: head: ClothingHeadHatFedoraWhite + groupBy: "fedora" ## Grey Flat Cap - type: loadout id: GreyFlatCap equipment: head: ClothingHeadHatGreyFlatcap + groupBy: "flatcap" ## Black Flat Cap - type: loadout id: BlackFlatCap equipment: head: ClothingHeadHatFlatBlack + groupBy: "flatcap" ## Brown Flat Cap - type: loadout id: BrownFlatCap equipment: head: ClothingHeadHatFlatBrown + groupBy: "flatcap" ## Brown Cowboy Hat - type: loadout id: BrownCowboyHat equipment: head: ClothingHeadHatCowboyBrown + groupBy: "cowboyhat" ## Black Cowboy Hat - type: loadout id: BlackCowboyHat equipment: head: ClothingHeadHatCowboyBlack + groupBy: "cowboyhat" ## Grey Cowboy Hat - type: loadout id: GreyCowboyHat equipment: head: ClothingHeadHatCowboyGrey + groupBy: "cowboyhat" ## Red Cowboy Hat - type: loadout id: RedCowboyHat equipment: head: ClothingHeadHatCowboyRed + groupBy: "cowboyhat" ## White Cowboy Hat - type: loadout id: WhiteCowboyHat equipment: head: ClothingHeadHatCowboyWhite + groupBy: "cowboyhat" ## Bounty Hunter Hat - type: loadout id: BountyHunterHat equipment: head: ClothingHeadHatCowboyBountyHunter + groupBy: "cowboyhat" ## Straw hat - type: loadout @@ -176,6 +197,7 @@ id: OutlawHat equipment: head: ClothingHeadHatOutlawHat + groupBy: "cowboyhat" ## Witch Hat - type: loadout @@ -195,48 +217,56 @@ id: BlackBandanaMask equipment: mask: ClothingMaskBandBlack + groupBy: "bandana" ## Blue Bandana Mask - type: loadout id: BlueBandanaMask equipment: mask: ClothingMaskBandBlue + groupBy: "bandana" ## Gold Bandana Mask - type: loadout id: GoldBandanaMask equipment: mask: ClothingMaskBandGold + groupBy: "bandana" ## Green Bandana Mask - type: loadout id: GreenBandanaMask equipment: mask: ClothingMaskBandGreen + groupBy: "bandana" ## Grey Bandana Mask - type: loadout id: GreyBandanaMask equipment: mask: ClothingMaskBandGrey + groupBy: "bandana" ## Red Bandana Mask - type: loadout id: RedBandanaMask equipment: mask: ClothingMaskBandRed + groupBy: "bandana" ## Brown Bandana Mask - type: loadout id: BrownBandanaMask equipment: mask: ClothingMaskBandBrown + groupBy: "bandana" ## Skull Bandana Mask - type: loadout id: SkullBandanaMask equipment: mask: ClothingMaskBandSkull + groupBy: "bandana" # Jumpsuit ## Black Jumpsuit @@ -244,177 +274,209 @@ id: BlackJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorBlack + groupBy: "jumpsuit" - type: loadout id: BlackJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorBlack + groupBy: "jumpskirt" ## Blue Jumpsuit - type: loadout id: BlueJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorBlue + groupBy: "jumpsuit" - type: loadout id: BlueJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorBlue + groupBy: "jumpskirt" ## Dark Blue Jumpsuit - type: loadout id: DarkBlueJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorDarkBlue + groupBy: "jumpsuit" - type: loadout id: DarkBlueJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorDarkBlue + groupBy: "jumpskirt" ## Teal Jumpsuit - type: loadout id: TealJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorTeal + groupBy: "jumpsuit" - type: loadout id: TealJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorTeal + groupBy: "jumpskirt" ## Green Jumpsuit - type: loadout id: GreenJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorGreen + groupBy: "jumpsuit" - type: loadout id: GreenJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorGreen + groupBy: "jumpskirt" ## Dark Green Jumpsuit - type: loadout id: DarkGreenJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorDarkGreen + groupBy: "jumpsuit" - type: loadout id: DarkGreenJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorDarkGreen + groupBy: "jumpskirt" ## Orange Jumpsuit - type: loadout id: OrangeJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorOrange + groupBy: "jumpsuit" - type: loadout id: OrangeJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorOrange + groupBy: "jumpskirt" ## Pink Jumpsuit - type: loadout id: PinkJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorPink + groupBy: "jumpsuit" - type: loadout id: PinkJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorPink + groupBy: "jumpskirt" ## Purple Jumpsuit - type: loadout id: PurpleJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorPurple + groupBy: "jumpsuit" - type: loadout id: PurpleJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorPurple + groupBy: "jumpskirt" ## Light Brown Jumpsuit - type: loadout id: LightBrownJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorLightBrown + groupBy: "jumpsuit" - type: loadout id: LightBrownJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorLightBrown + groupBy: "jumpskirt" ## Brown Jumpsuit - type: loadout id: BrownJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorBrown + groupBy: "jumpsuit" - type: loadout id: BrownJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorBrown + groupBy: "jumpskirt" ## Maroon Jumpsuit - type: loadout id: MaroonJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorMaroon + groupBy: "jumpsuit" - type: loadout id: MaroonJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorMaroon + groupBy: "jumpskirt" ## Rose Hoodie w/ Skirt - type: loadout id: MioSkirt equipment: jumpsuit: ClothingCostumeMioSkirt + groupBy: "hoodie" ## Turqoise Hoodie w/ Shorts - type: loadout id: NaotaHoodie equipment: jumpsuit: ClothingCostumeNaota + groupBy: "hoodie" ## Casual Red - type: loadout id: CasualRedSkirt equipment: jumpsuit: ClothingUniformJumpskirtCasualRed + groupBy: "casualjumpskirt" - type: loadout id: CasualRedSuit equipment: jumpsuit: ClothingUniformJumpsuitCasualRed + groupBy: "casualjumpsuit" ## Casual Blue - type: loadout id: CasualBlueSkirt equipment: jumpsuit: ClothingUniformJumpskirtCasualBlue + groupBy: "casualjumpskirt" - type: loadout id: CasualBlueSuit equipment: jumpsuit: ClothingUniformJumpsuitCasualBlue + groupBy: "casualjumpsuit" ## Casual Purple - type: loadout id: CasualPurpleSkirt equipment: jumpsuit: ClothingUniformJumpskirtCasualPurple + groupBy: "casualjumpskirt" - type: loadout id: CasualPurpleSuit equipment: jumpsuit: ClothingUniformJumpsuitCasualPurple + groupBy: "casualjumpsuit" # Elegant dresses ## Black elegant dress @@ -422,30 +484,35 @@ id: BlackElegantDress equipment: jumpsuit: ClothingUniformJumpskirtBlackElegantDress + groupBy: "elegantdress" ## Red Elegant Dress - type: loadout id: RedElegantDress equipment: jumpsuit: ClothingUniformJumpskirtRedElegantDress + groupBy: "elegantdress" ## Green Elegant Dress - type: loadout id: GreenElegantDress equipment: jumpsuit: ClothingUniformJumpskirtGreenElegantDress + groupBy: "elegantdress" ## Blue Elegant Dress - type: loadout id: BlueElegantDress equipment: jumpsuit: ClothingUniformJumpskirtBlueElegantDress + groupBy: "elegantdress" ## Purple Elegant Dress - type: loadout id: PurpleElegantDress equipment: jumpsuit: ClothingUniformJumpskirtPurpleElegantDress + groupBy: "elegantdress" # Striped Dresses ## Cyan Striped Dress @@ -453,30 +520,35 @@ id: CyanStripedDress equipment: jumpsuit: ClothingUniformJumpskirtCyanStripedDress + groupBy: "stripedress" ## Red Striped Dress - type: loadout id: RedStripedDress equipment: jumpsuit: ClothingUniformJumpskirtRedStripedDress + groupBy: "stripedress" ## Green Striped Dress - type: loadout id: GreenStripedDress equipment: jumpsuit: ClothingUniformJumpskirtGreenStripedDress + groupBy: "stripedress" ## Pink Striped Dress - type: loadout id: PinkStripedDress equipment: jumpsuit: ClothingUniformJumpskirtPinkStripedDress + groupBy: "stripedress" ## Orange Striped Dress - type: loadout id: OrangeStripedDress equipment: jumpsuit: ClothingUniformJumpskirtOrangeStripedDress + groupBy: "stripedress" # Turtleneck Dresses ## Purple Turtleneck Dress @@ -484,30 +556,35 @@ id: PurpleTurtleneckDress equipment: jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress + groupBy: "turtleneckdress" ## Red Turtleneck Dress - type: loadout id: RedTurtleneckDress equipment: jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress + groupBy: "turtleneckdress" ## Green Turtleneck Dress - type: loadout id: GreenTurtleneckDress equipment: jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress + groupBy: "turtleneckdress" ## Blue Turtleneck Dress - type: loadout id: BlueTurtleneckDress equipment: jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress + groupBy: "turtleneckdress" ## Yellow Turtleneck Dress - type: loadout id: YellowTurtleneckDress equipment: jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress + groupBy: "turtleneckdress" ## Yellow Old Dress - type: loadout @@ -521,48 +598,56 @@ id: RedGloves equipment: gloves: ClothingHandsGlovesColorRed + groupBy: "glove" ## Blue Gloves - type: loadout id: BlueGloves equipment: gloves: ClothingHandsGlovesColorBlue + groupBy: "glove" ## Teal Gloves - type: loadout id: TealGloves equipment: hands: ClothingHandsGlovesColorTeal + groupBy: "glove" ## Brown Gloves - type: loadout id: BrownGloves equipment: gloves: ClothingHandsGlovesColorBrown + groupBy: "glove" ## Light Brown Gloves - type: loadout id: LightBrownGloves equipment: gloves: ClothingHandsGlovesColorLightBrown + groupBy: "glove" ## Grey Gloves - type: loadout id: GreyGloves equipment: gloves: ClothingHandsGlovesColorGray + groupBy: "glove" ## Green Gloves - type: loadout id: GreenGloves equipment: gloves: ClothingHandsGlovesColorGreen + groupBy: "glove" ## Black Gloves - type: loadout id: BlackGloves equipment: gloves: ClothingHandsGlovesColorBlack + groupBy: "glove" ## Fingerless Black Gloves - type: loadout @@ -576,96 +661,112 @@ id: BlackWinterCoat equipment: outerClothing: ClothingOuterWinterColorBlack + groupBy: "wintercoat" ## Purple Winter Coat - type: loadout id: PurpleWinterCoat equipment: outerClothing: ClothingOuterWinterColorPurple + groupBy: "wintercoat" ## Red Winter Coat - type: loadout id: RedWinterCoat equipment: outerClothing: ClothingOuterWinterColorRed + groupBy: "wintercoat" ## Blue Winter Coat - type: loadout id: BlueWinterCoat equipment: outerClothing: ClothingOuterWinterColorBlue + groupBy: "wintercoat" ## Brown Winter Coat - type: loadout id: BrownWinterCoat equipment: outerClothing: ClothingOuterWinterColorBrown + groupBy: "wintercoat" ## Light Brown Winter Coat - type: loadout id: LightBrownWinterCoat equipment: outerClothing: ClothingOuterWinterColorLightBrown + groupBy: "wintercoat" ## Gray Winter Coat - type: loadout id: GrayWinterCoat equipment: outerClothing: ClothingOuterWinterColorGray + groupBy: "wintercoat" ## Green Winter Coat - type: loadout id: GreenWinterCoat equipment: outerClothing: ClothingOuterWinterColorGreen + groupBy: "wintercoat" ## Orange Winter Coat - type: loadout id: OrangeWinterCoat equipment: outerClothing: ClothingOuterWinterColorOrange + groupBy: "wintercoat" ## White Winter Coat - type: loadout id: WhiteWinterCoat equipment: outerClothing: ClothingOuterWinterColorWhite + groupBy: "wintercoat" ## Yellow Winter Coat - type: loadout id: YellowWinterCoat equipment: outerClothing: ClothingOuterWinterColorYellow + groupBy: "wintercoat" ## Black Hoodie - type: loadout id: BlackHoodie equipment: outerClothing: ClothingOuterHoodieBlack + groupBy: "hoodie" ## Gray Hoodie - type: loadout id: GrayHoodie equipment: outerClothing: ClothingOuterHoodieGrey + groupBy: "hoodie" ## Flannel Red - type: loadout id: FlannelRed equipment: outerClothing: ClothingOuterFlannelRed + groupBy: "flannel" ## Flannel Blue - type: loadout id: FlannelBlue equipment: outerClothing: ClothingOuterFlannelBlue + groupBy: "flannel" ## Flannel Green - type: loadout id: FlannelGreen equipment: outerClothing: ClothingOuterFlannelGreen + groupBy: "flannel" # Shoes ## Green Shoes @@ -673,30 +774,35 @@ id: GreenShoes equipment: shoes: ClothingShoesColorGreen + groupBy: "coloredshoe" ## Orange SHoes - type: loadout id: OrangeShoes equipment: shoes: ClothingShoesColorOrange + groupBy: "coloredshoe" ## Red Shoes - type: loadout id: RedShoes equipment: shoes: ClothingShoesColorRed + groupBy: "coloredshoe" ## Yellow Shoes - type: loadout id: YellowShoes equipment: shoes: ClothingShoesColorYellow + groupBy: "coloredshoe" ## Purple Shoes - type: loadout id: PurpleShoes equipment: shoes: ClothingShoesColorPurple + groupBy: "coloredshoe" ## High Heels - type: loadout @@ -709,15 +815,18 @@ id: BrownCowboyBoots equipment: shoes: ClothingShoesBootsCowboyBrown + groupBy: "coloredshoe" ## Black Cowboy Boots - type: loadout id: BlackCowboyBoots equipment: shoes: ClothingShoesBootsCowboyBlack + groupBy: "cowboy" ## White Cowboy Boots - type: loadout id: WhiteCowboyBoots equipment: shoes: ClothingShoesBootsCowboyWhite + groupBy: "cowboy" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/service_worker.yml index fa6be6429e..01c16c89c6 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/service_worker.yml @@ -13,3 +13,4 @@ id: ServiceWorkerBandana equipment: head: ClothingHeadBandGreen + groupBy: "headband" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml index bcb1393a36..3354043296 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml @@ -47,3 +47,4 @@ id: CaptainWinterBoots equipment: shoes: ClothingShoesBootsWinterCap + groupBy: "winterboots" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/chief_engineer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/chief_engineer.yml index 67b95a4779..0f556ff016 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/chief_engineer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/chief_engineer.yml @@ -3,3 +3,4 @@ id: insulatedgloves equipment: gloves: ClothingHandsGlovesColorYellow + groupBy: "glove" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/head_of_personnel.yml index 7f8ff5f4b8..3cd5726145 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/head_of_personnel.yml @@ -4,26 +4,31 @@ id: HoPFormal equipment: jumpsuit: ClothingUniformJumpsuitHoPFormal + groupBy: "jumpsuit" - type: loadout id: HoPFormalDress equipment: jumpsuit: ClothingUniformJumpskirtHoPFormal + groupBy: "jumpskirt" - type: loadout id: HoPMessSkirt equipment: jumpsuit: ClothingUniformJumpskirtHoPMess + groupBy: "jumpskirt" - type: loadout id: HoPMessSuit equipment: jumpsuit: ClothingUniformJumpsuitHoPMess + groupBy: "jumpsuit" - type: loadout id: HoPBoatswain equipment: jumpsuit: ClothingUniformJumpsuitBoatswain + groupBy: "jumpsuit" # Back - type: loadout @@ -56,6 +61,7 @@ id: HoPLongcoat equipment: outerClothing: ClothingLongcoatHoP + groupBy: "longcoat" # Gloves - type: loadout @@ -68,18 +74,22 @@ id: BrownLeatherShoes equipment: shoes: ClothingShoesLeather + groupBy: "leathershoes" - type: loadout id: WhiteLeatherShoes equipment: shoes: ClothingShoesMiscWhite + groupBy: "leathershoes" - type: loadout id: LaceupShoes equipment: shoes: ClothingShoesBootsLaceup + groupBy: "leathershoes" - type: loadout id: HoPWinterBoots equipment: shoes: ClothingShoesBootsWinterHeadOfPersonel + groupBy: "winterboots" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml index 29e08c5e8e..1c84d6ba15 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -36,9 +36,11 @@ id: AtmosphericTechnicianJumpskirtCasual equipment: jumpsuit: ClothingUniformJumpskirtAtmosCasual + groupBy: "jumpskirt" # Shoes - type: loadout id: AtmosWinterBoots equipment: shoes: ClothingShoesBootsWinterAtmos + groupBy: "winterboots" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/chief_engineer.yml index 6afd46f499..d296c175f2 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -3,3 +3,4 @@ id: ChiefEngineerLongcoat equipment: outerClothing: ClothingLongcoatCE + groupBy: "longcoat" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml index 5f745bc98d..0f2eb19945 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml @@ -14,3 +14,4 @@ id: StationEngineerWintercoat equipment: outerClothing: ClothingOuterWinterEngi + groupBy: "wintercoat" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/chiefjustice.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/chiefjustice.yml index e7b1b9b531..48663db31d 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/chiefjustice.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/chiefjustice.yml @@ -9,26 +9,31 @@ id: ChiefJusticeJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChiefJustice + groupBy: "jumpsuit" - type: loadout id: ChiefJusticeJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChiefJustice + groupBy: "jumpskirt" - type: loadout id: ChiefJusticeFormalJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChiefJusticeFormal + groupBy: "jumpsuit" - type: loadout id: ChiefJusticeFormalJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCJFormal + groupBy: "jumpskirt" - type: loadout id: ChiefJusticeWhiteJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChiefJusticeWhite + groupBy: "jumpsuit" # Neck - type: loadout @@ -51,4 +56,4 @@ - type: loadout id: LeatherShoes equipment: - shoes: ClothingShoesLeather + shoes: ClothingShoesLeather diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/clerk.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/clerk.yml index f580f4e662..a66703710c 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/clerk.yml @@ -14,31 +14,37 @@ id: BlackTie equipment: neck: ClothingNeckTieBlack + groupBy: "necktie" - type: loadout id: BlueTie equipment: neck: ClothingNeckTieBlue + groupBy: "necktie" - type: loadout id: BrownTie equipment: neck: ClothingNeckTieBrown + groupBy: "necktie" - type: loadout id: GreenTie equipment: neck: ClothingNeckTieGreen + groupBy: "necktie" - type: loadout id: RedTie equipment: neck: ClothingNeckTieRed + groupBy: "necktie" - type: loadout id: WhiteTie equipment: neck: ClothingNeckTieWhite + groupBy: "necktie" # Outer Clothing - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/prosecutor.yml index 512edcdd7f..90a3bf8c97 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Justice/prosecutor.yml @@ -3,11 +3,13 @@ id: ProsecutorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitProsecutor + groupBy: "jumpsuit" - type: loadout id: ProsecutorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtProsecutor + groupBy: "jumpskirt" # Neck - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml index 8c7e14de83..42f3d64230 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml @@ -3,11 +3,13 @@ id: ChemistFormalSuit equipment: jumpsuit: ClothingUniformJumpsuitChemShirt + groupBy: "jumpsuit" - type: loadout id: ChemistFormalSkirt equipment: jumpsuit: ClothingUniformJumpskirtChemShirt + groupBy: "jumpskirt" - type: loadout id: SeniorChemistJumpsuit @@ -19,6 +21,7 @@ time: 216000 equipment: jumpsuit: ClothingUniformChemistSenior + groupBy: "jumpsuit" - type: loadout id: SeniorChemistJumpskirt @@ -30,6 +33,7 @@ time: 216000 equipment: jumpsuit: ClothingUniformJumpskirtChemistSenior + groupBy: "jumpskirt" # OuterClothing - type: loadout @@ -47,23 +51,27 @@ time: 216000 equipment: outerClothing: ClothingOuterCoatLabSeniorChemist + groupBy: "labcoat" - type: loadout id: ChemistLongLabCoat equipment: outerClothing: ClothingOuterCoatLabLongChemist + groupBy: "labcoat" # Gloves - type: loadout id: ChemistGloves equipment: gloves: ClothingHandsGlovesChemist + groupBy: "glove" # Shoes - type: loadout id: ChemistWinterBoots equipment: shoes: ClothingShoesBootsWinterChem + groupBy: "winterboots" - type: loadout id: ChemistShoes @@ -75,6 +83,7 @@ id: ChemistTie equipment: neck: ClothingNeckTieChem + groupBy: "necktie" # Chemist alt title - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml index 189efcb807..e791e6c09c 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -3,17 +3,20 @@ id: ChiefMedicalOfficerLongcoat equipment: outerClothing: ClothingLongcoatCMO + groupBy: "longcoat" - type: loadout id: ChiefMedicalOfficerLongLabCoat equipment: outerClothing: ClothingOuterCoatLabLongCMO + groupBy: "labcoat" # Shoes - type: loadout id: ChiefMedicalOfficerWinterBoots equipment: shoes: ClothingShoesBootsWinterChiefMedicalOfficer + groupBy: "winterboots" # Neck - type: loadout @@ -32,23 +35,28 @@ id: ChiefMedicalOfficerFormalJumpsuit equipment: jumpsuit: ClothingUniformCMOFormal + groupBy: "jumpsuit" - type: loadout id: ChiefMedicalOfficerFormalJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCMOFormal + groupBy: "jumpskirt" - type: loadout id: ChiefMedicalOfficerVestJumpsuit equipment: jumpsuit: ClothingUniformCMOVest + groupBy: "jumpsuit" - type: loadout id: ChiefMedicalOfficerVestJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCMOVest + groupBy: "jumpskirt" - type: loadout id: ChiefMedicalOfficerSummerShirt equipment: jumpsuit: ClothingUniformCMOSummer + groupBy: "jumpsuit" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml index 35441f7f9d..7cd686e1e8 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml @@ -31,31 +31,37 @@ id: MedicalApronJumpsuit equipment: jumpsuit: ClothingUniformMedicalApron + groupBy: "jumpsuit" - type: loadout id: MedicalApronJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMedicalApron + groupBy: "jumpskirt" - type: loadout id: MedicalOffsetJumpsuit equipment: jumpsuit: ClothingUniformMedicalOffset + groupBy: "jumpsuit" - type: loadout id: MedicalOffsetJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMedicalOffset + groupBy: "jumpskirt" - type: loadout id: MedicalVestJumpsuit equipment: jumpsuit: ClothingUniformMedicalVest + groupBy: "jumpsuit" - type: loadout id: MedicalVestJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMedicalVest + groupBy: "jumpskirt" # OuterClothing @@ -63,13 +69,16 @@ id: MedicalLabCoat equipment: outerClothing: ClothingOuterCoatLabMedical + groupBy: "labcoat" - type: loadout id: MedicalLongLabCoat equipment: outerClothing: ClothingOuterCoatLabLongMedical + groupBy: "labcoat" - type: loadout id: LongLabCoat equipment: outerClothing: ClothingOuterCoatLabLong + groupBy: "labcoat" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml index 304f363640..1e5a874f3e 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml @@ -3,6 +3,7 @@ id: ParamedicWinterBoots equipment: shoes: ClothingShoesBootsWinterParamedic + groupBy: "winterboots" # Head - type: loadout @@ -15,11 +16,13 @@ id: ParamedicJumpSuitJumper equipment: jumpsuit: ClothingUniformParamedicJumper + groupBy: "jumpsuit" - type: loadout id: ParamedicJumpSkirtJumper equipment: jumpsuit: ClothingUniformJumpskirtParamedicJumper + groupBy: "jumpskirt" # OuterClothing - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml index 2a6f4346d4..5fb18867a2 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml @@ -36,17 +36,20 @@ id: PsychologistGreyFlatcap equipment: head: ClothingHeadHatGreyFlatcap + groupBy: "flatcap" - type: loadout id: PsychologistBrownFlatcap equipment: head: ClothingHeadHatBrownFlatcap + groupBy: "flatcap" # OuterClothing - type: loadout id: PsychologistWinterCoat equipment: outerClothing: ClothingOuterWinterCoat + groupBy: "wintercoat" - type: loadout id: PsychologistCoatBomber diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml index 9104001cca..4623938ab8 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml @@ -10,49 +10,59 @@ id: BlackSurgeryCap equipment: head: ClothingHeadHatSurgcapBlack + groupBy: "scrubs" - type: loadout id: CyanSurgeryCap equipment: head: ClothingHeadHatSurgcapCyan + groupBy: "scrubs" - type: loadout id: PinkSurgeryCap equipment: head: ClothingHeadHatSurgcapPink + groupBy: "scrubs" - type: loadout id: WhiteSurgeryCap equipment: head: ClothingHeadHatSurgcapWhite + groupBy: "scrubs" - type: loadout id: RainbowSurgeryCap equipment: head: ClothingHeadHatSurgcapRainbow + groupBy: "scrubs" # Jumpsuit - type: loadout id: MedicalBlackScrubs equipment: jumpsuit: UniformScrubsColorBlack + groupBy: "scrubs" - type: loadout id: MedicalCyanScrubs equipment: jumpsuit: UniformScrubsColorCyan + groupBy: "scrubs" - type: loadout id: MedicalPinkScrubs equipment: jumpsuit: UniformScrubsColorPink + groupBy: "scrubs" - type: loadout id: MedicalWhiteScrubs equipment: jumpsuit: UniformScrubsColorWhite + groupBy: "scrubs" - type: loadout id: MedicalRainbowScrubs equipment: jumpsuit: UniformScrubsColorRainbow + groupBy: "scrubs" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml index 656908ba5a..d827674e7e 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml @@ -20,14 +20,17 @@ id: MystaLabCoat equipment: outerClothing: ClothingOuterCoatRndMysta + groupBy: "labcoat" - type: loadout id: ResearchDirectorLongcoat equipment: outerClothing: ClothingLongcoatRD + groupBy: "longcoat" # Shoes - type: loadout id: ResearchDirectorWinterBoots equipment: shoes: ClothingShoesBootsWinterMystagogue + groupBy: "winterboots" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml index 00361ccdd7..afcf4fe0cd 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/roboticist.yml @@ -31,6 +31,7 @@ id: RoboticsWinterBoots equipment: shoes: ClothingShoesBootsWinterRobo + groupBy: "winterboots" # PDA - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/scientist.yml index 5b66f78a80..3075723851 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/scientist.yml @@ -15,8 +15,10 @@ id: FormalScientistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitScientistFormal + groupBy: "jumpsuit" - type: loadout id: FormalScientistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtScientistFormal + groupBy: "jumpskirt" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml index 1645006463..19b7ddedec 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/brigmedic.yml @@ -14,21 +14,25 @@ id: BrigMedicJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitBrigmedic + groupBy: "jumpsuit" - type: loadout id: BrigMedicJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtBrigmedic + groupBy: "jumpskirt" - type: loadout id: BrigMedicTurtlesuit equipment: jumpsuit: ClothingUniformJumpsuitBrigmedicTurtle + groupBy: "jumpsuit" - type: loadout id: BrigMedicTurtleskirt equipment: jumpsuit: ClothingUniformJumpskirtBrigmedicTurtle + groupBy: "jumpskirt" # Back - type: loadout @@ -52,11 +56,13 @@ id: StasecWinterCoatCorpsman equipment: outerClothing: ClothingOuterCoatStasecCorpsman + groupBy: "wintercoat" - type: loadout id: LongcoatBrigmedic equipment: outerClothing: ClothingLongcoatBrigmedic + groupBy: "longcoat" # Eyewear - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml index 99d629645e..cb45461987 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml @@ -52,27 +52,32 @@ id: ForensicSpecJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitForensicSpec + groupBy: "jumpsuit" - type: loadout id: ForensicSpecJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtForensicSpec + groupBy: "jumpskirt" - type: loadout id: ForensicSpecTurtlesuit equipment: jumpsuit: ClothingUniformJumpsuitDetTurtle + groupBy: "jumpsuit" - type: loadout id: ForensicSpecTurtleskirt equipment: jumpsuit: ClothingUniformJumpskirtDetTurtle + groupBy: "jumpskirt" #OuterClothing - type: loadout id: StasecWinterCoatDet equipment: outerClothing: ClothingOuterCoatStasecDet + groupBy: "wintercoat" - type: loadout id: DetPlatedCoat diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml index 0d8b627ab0..2cdee35e00 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml @@ -3,31 +3,39 @@ id: HeadofSecurityJumpsuitGrey equipment: jumpsuit: ClothingUniformJumpsuitHoSGrey + groupBy: "jumpsuit" - type: loadout id: HeadofSecurityJumpskirtGrey equipment: jumpsuit: ClothingUniformJumpskirtHoSGrey + groupBy: "jumpskirt" - type: loadout id: HeadofSecurityJumpsuitBlue equipment: jumpsuit: ClothingUniformJumpsuitHoSBlue + groupBy: "jumpsuit" - type: loadout id: HeadofSecurityJumpskirtBlue equipment: jumpsuit: ClothingUniformJumpskirtHoSBlue + groupBy: "jumpskirt" + - type: loadout id: HeadofSecurityParadeSuit equipment: jumpsuit: ClothingUniformJumpsuitHoSParadeMale + groupBy: "jumpsuit" - type: loadout id: HeadofSecurityParadeSkirt equipment: jumpsuit: ClothingUniformJumpskirtHoSParadeMale + groupBy: "jumpskirt" + # Head - type: loadout @@ -40,6 +48,7 @@ id: StasecWinterCoatHoS equipment: outerClothing: ClothingOuterCoatStasecHoS + groupBy: "wintercoat" - type: loadout id: HeadOfSecurityTrenchcoat @@ -50,12 +59,14 @@ id: HeadofSecurityLongcoat equipment: outerClothing: ClothingLongcoatHoS + groupBy: "longcoat" # Shoes - type: loadout id: HeadOfSecurityWinterBoots equipment: shoes: ClothingShoesBootsWinterHeadOfSecurity + groupBy: "winterboots" # Neck - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml index 4357ead235..a59edb9fb1 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml @@ -46,11 +46,13 @@ id: SecurityJumpsuitBlue equipment: jumpsuit: ClothingUniformJumpsuitSecBlue + groupBy: "jumpsuit" - type: loadout id: SecurityJumpskirtBlue equipment: jumpsuit: ClothingUniformJumpskirtSecBlue + groupBy: "jumpskirt" - type: loadout id: SeniorSecOfficerJumpsuit @@ -59,6 +61,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpsuitSecSenior + groupBy: "jumpsuit" - type: loadout id: SeniorSecOfficerJumpskirt @@ -67,6 +70,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpskirtSecSenior + groupBy: "jumpskirt" - type: loadout id: SeniorSecOfficerTurtlesuit @@ -75,6 +79,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpsuitSecTurtle + groupBy: "jumpsuit" - type: loadout id: SeniorSecOfficerTurtleskirt @@ -83,6 +88,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpskirtSecTurtle + groupBy: "jumpskirt" - type: loadout id: SeniorSecOfficerFormalSuit @@ -91,6 +97,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpsuitSecFormal + groupBy: "jumpsuit" - type: loadout id: SeniorSecOfficerFormalSkirt @@ -99,6 +106,7 @@ proto: SeniorOfficer equipment: jumpsuit: ClothingUniformJumpskirtSecFormal + groupBy: "jumpskirt" # OuterClothing @@ -126,6 +134,7 @@ id: LongcoatSecurity equipment: outerClothing: ClothingLongcoatSecurity + groupBy: "longcoat" # Neck diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml index 6c19560a2d..86808bcda4 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml @@ -3,31 +3,37 @@ id: WardenJumpsuitGrey equipment: jumpsuit: ClothingUniformJumpsuitWardenGrey + groupBy: "jumpsuit" - type: loadout id: WardenJumpskirtGrey equipment: jumpsuit: ClothingUniformJumpskirtWardenGrey + groupBy: "jumpskirt" - type: loadout id: WardenJumpsuitBlue equipment: jumpsuit: ClothingUniformJumpsuitWardenBlue + groupBy: "jumpsuit" - type: loadout id: WardenJumpskirtBlue equipment: jumpsuit: ClothingUniformJumpskirtWardenBlue + groupBy: "jumpskirt" - type: loadout id: WardenTurtlesuit equipment: jumpsuit: ClothingUniformJumpsuitWardenTurtle + groupBy: "jumpsuit" - type: loadout id: WardenTurtleskirt equipment: jumpsuit: ClothingUniformJumpskirtWardenTurtle + groupBy: "jumpskirt" # OuterClothing - type: loadout @@ -40,3 +46,4 @@ id: WardenLongcoat equipment: outerClothing: ClothingLongcoatWarden + groupBy: "longcoat" diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml index a9833798c7..59b27b07ed 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml @@ -3,29 +3,35 @@ id: BoxerShorts equipment: jumpsuit: UniformShortsRed + groupBy: "jumpsuit" - type: loadout id: BoxerShortsWithTop equipment: jumpsuit: UniformShortsRedWithTop + groupBy: "jumpskirt" # Gloves - type: loadout id: RedBoxingGloves equipment: gloves: ClothingHandsGlovesBoxingRed + groupBy: "glove" - type: loadout id: BlueBoxingGloves equipment: gloves: ClothingHandsGlovesBoxingBlue + groupBy: "glove" - type: loadout id: GreenBoxingGloves equipment: gloves: ClothingHandsGlovesBoxingGreen + groupBy: "glove" - type: loadout id: YellowBoxingGloves equipment: gloves: ClothingHandsGlovesBoxingYellow + groupBy: "glove" diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/scarfs.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/scarfs.yml index 90df78381c..a444ab549f 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/scarfs.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/scarfs.yml @@ -4,51 +4,60 @@ id: ScarfRed equipment: neck: ClothingNeckScarfStripedRed + groupBy: "winterscarf" #Blue - type: loadout id: ScarfBlue equipment: neck: ClothingNeckScarfStripedBlue + groupBy: "winterscarf" #LightBlue - type: loadout id: ScarfLightBlue equipment: neck: ClothingNeckScarfStripedLightBlue + groupBy: "winterscarf" #Green - type: loadout id: ScarfGreen equipment: neck: ClothingNeckScarfStripedGreen + groupBy: "winterscarf" #Purple - type: loadout id: ScarfPurple equipment: neck: ClothingNeckScarfStripedPurple + groupBy: "winterscarf" #Brown - type: loadout id: ScarfBrown equipment: neck: ClothingNeckScarfStripedBrown + groupBy: "winterscarf" #Orange - type: loadout id: ScarfOrange equipment: neck: ClothingNeckScarfStripedOrange + groupBy: "winterscarf" #Black - type: loadout id: ScarfBlack equipment: neck: ClothingNeckScarfStripedBlack + groupBy: "winterscarf" #Zebra - type: loadout id: ScarfZebra equipment: neck: ClothingNeckScarfStripedZebra + groupBy: "winterscarf" diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/trinkets.yml index 35e4a8687d..4d40cf1eb4 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/trinkets.yml @@ -9,12 +9,14 @@ storage: back: - GoldRing + groupBy: "rings" - type: loadout id: SilverRing storage: back: - SilverRing + groupBy: "rings" - type: loadout id: WhiteCane @@ -50,9 +52,11 @@ storage: back: - PlushieExperiment + groupBy: "plushie" - type: loadout id: PlushieBee storage: back: - PlushieBee + groupBy: "plushie" diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/turtleneck.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/turtleneck.yml index ead5d80667..a95eefa5be 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/turtleneck.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/turtleneck.yml @@ -3,41 +3,49 @@ id: BlueTurtleneckJumpsuit equipment: jumpsuit: ClothingUniformTurtleneckColorBlue + groupBy: "jumpsuit" - type: loadout id: BlueTurtleneckJumpskirt equipment: jumpsuit: ClothingUniformTurtleneckSkirtColorBlue + groupBy: "jumpskirt" # Dark blue - type: loadout id: DarkBlueTurtleneckJumpsuit equipment: jumpsuit: ClothingUniformTurtleneckColorDarkBlue + groupBy: "jumpsuit" - type: loadout id: DarkBlueTurtleneckJumpskirt equipment: jumpsuit: ClothingUniformTurtleneckSkirtColorDarkBlue + groupBy: "jumpskirt" # White - type: loadout id: WhiteTurtleneckJumpsuit equipment: jumpsuit: ClothingUniformTurtleneckColorWhite + groupBy: "jumpsuit" - type: loadout id: WhiteTurtleneckJumpskirt equipment: jumpsuit: ClothingUniformTurtleneckSkirtColorWhite + groupBy: "jumpskirt" # Orange - type: loadout id: OrangeTurtleneckJumpsuit equipment: jumpsuit: ClothingUniformTurtleneckColorOrange + groupBy: "jumpsuit" - type: loadout id: OrangeTurtleneckJumpskirt equipment: jumpsuit: ClothingUniformTurtleneckSkirtColorOrange + groupBy: "jumpskirt" diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/wintercoats.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/wintercoats.yml index 3a85f2fd0c..5f6461cdaf 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/wintercoats.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/wintercoats.yml @@ -2,71 +2,85 @@ id: WinterCoatBrown equipment: outerClothing: ClothingOuterWinterColorBrown + groupBy: "wintercoat" - type: loadout id: WinterCoatBlack equipment: outerClothing: ClothingOuterWinterColorBlack + groupBy: "wintercoat" - type: loadout id: WinterCoatGray equipment: outerClothing: ClothingOuterWinterColorGray + groupBy: "wintercoat" - type: loadout id: WinterCoatWhite equipment: outerClothing: ClothingOuterWinterColorWhite + groupBy: "wintercoat" - type: loadout id: WinterCoatBlue equipment: outerClothing: ClothingOuterWinterColorBlue + groupBy: "wintercoat" - type: loadout id: WinterCoatRed equipment: outerClothing: ClothingOuterWinterColorRed + groupBy: "wintercoat" - type: loadout id: WinterCoatGreen equipment: outerClothing: ClothingOuterWinterColorGreen + groupBy: "wintercoat" - type: loadout id: WinterCoatOrange equipment: outerClothing: ClothingOuterWinterColorOrange + groupBy: "wintercoat" - type: loadout id: WinterCoatYellow equipment: outerClothing: ClothingOuterWinterColorYellow + groupBy: "wintercoat" - type: loadout id: WinterCoatLightBrown equipment: outerClothing: ClothingOuterWinterColorLightBrown + groupBy: "wintercoat" - type: loadout id: WinterCoatPurple equipment: outerClothing: ClothingOuterWinterColorPurple + groupBy: "wintercoat" - type: loadout id: WinterCoat equipment: outerClothing: ClothingOuterWinterCoat + groupBy: "wintercoat" - type: loadout id: WinterCoatLong equipment: outerClothing: ClothingOuterWinterCoatLong + groupBy: "wintercoat" - type: loadout id: WinterCoatPlaid equipment: outerClothing: ClothingOuterWinterCoatPlaid + groupBy: "wintercoat" - type: loadout id: CorporateJacket @@ -77,13 +91,16 @@ id: LongcoatBlack equipment: outerClothing: ClothingLongcoatBlack + groupBy: "longcoat" - type: loadout id: LongcoatBrown equipment: outerClothing: ClothingLongcoatBrown + groupBy: "longcoat" - type: loadout id: LongcoatNanoTrasen equipment: outerClothing: ClothingLongcoatNanoTrasen + groupBy: "longcoat" diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml index 9b3e526d7a..ee479edb11 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml @@ -11,11 +11,13 @@ id: ClothingUniformNightclubSuit equipment: jumpsuit: ClothingUniformNightclubSuit #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformNightclubSuitSkirt equipment: jumpsuit: ClothingUniformNightclubSuitSkirt #imp + groupBy: "jumpskirt" #DeltaV - type: loadout id: ClothingUniformSeniorBartender @@ -24,6 +26,7 @@ proto: SeniorBartender equipment: jumpsuit: ClothingUniformSeniorBartender #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformSeniorBartenderSkirt @@ -32,3 +35,4 @@ proto: SeniorBartender equipment: jumpsuit: ClothingUniformSeniorBartenderSkirt #imp + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml index 17fc036159..23a209268e 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml @@ -2,8 +2,10 @@ id: ClothingUniformFuneralSuit equipment: jumpsuit: ClothingUniformFuneralSuit #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformFuneralSuitSkirt equipment: jumpsuit: ClothingUniformFuneralSuitSkirt #imp + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml index fc905a1a72..6438b391d1 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml @@ -2,8 +2,10 @@ id: ClothingUniformCreamSuit equipment: jumpsuit: ClothingUniformCreamSuit #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformCreamSuitSkirt equipment: jumpsuit: ClothingUniformCreamSuitSkirt #imp + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml index d3a5f4dfc7..a35e6e4f92 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml @@ -2,8 +2,10 @@ id: ClothingUniformBrownSuit equipment: jumpsuit: ClothingUniformBrownSuit #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformBrownSuitSkirt equipment: jumpsuit: ClothingUniformBrownSuitSkirt #imp + diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml index bccff24816..fdd74b35b4 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml @@ -2,8 +2,10 @@ id: ClothingUniformMrSpaceWide equipment: jumpsuit: ClothingUniformMrSpaceWide #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformMrSpaceWideSkirt equipment: jumpsuit: ClothingUniformMrSpaceWideSkirt #imp + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml index 0697a93d73..1c99b7c852 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml @@ -2,18 +2,22 @@ id: ClothingUniformMiamiVice equipment: jumpsuit: ClothingUniformMiamiVice #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformMiamiViceSkirt equipment: jumpsuit: ClothingUniformMiamiViceSkirt #imp + groupBy: "jumpskirt" #DeltaV - type: loadout id: ClothingUniformDetectiveSuit equipment: jumpsuit: ClothingUniformDetectiveSuit #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformDetectiveSuitSkirt equipment: jumpsuit: ClothingUniformDetectiveSuitSkirt #imp + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml index cbca21331f..6ab2cb2772 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml @@ -2,8 +2,10 @@ id: ClothingUniformBrosBlazer equipment: jumpsuit: ClothingUniformBrosBlazer #imp + groupBy: "jumpsuit" #DeltaV - type: loadout id: ClothingUniformBrosBlazerSkirt equipment: jumpsuit: ClothingUniformBrosBlazerSkirt #imp + groupBy: "jumpskirt" #DeltaV diff --git a/Resources/Prototypes/_Starlight/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/_Starlight/Loadouts/Jobs/Civilian/clown.yml index 7b6ce8396b..bb4e1e487a 100644 --- a/Resources/Prototypes/_Starlight/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/_Starlight/Loadouts/Jobs/Civilian/clown.yml @@ -2,3 +2,4 @@ id: ClownSkirt equipment: jumpsuit: ClothingUniformJumpskirtClown + groupBy: "jumpskirt" #DeltaV