From bcc1267d51c643de3f8b214daac3175b0f515d92 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 10:54:04 -0500 Subject: [PATCH 01/27] aaaaaaaaaaaaa --- .../Loadouts/{ => Generic}/backpacks.yml | 28 - .../Loadouts/{ => Generic}/duffelbags.yml | 28 - .../Loadouts/{ => Generic}/eyes.yml | 0 .../Loadouts/{ => Generic}/hands.yml | 0 .../Loadouts/{ => Generic}/head.yml | 0 .../Loadouts/{ => Generic}/items.yml | 0 .../Loadouts/{ => Generic}/mask.yml | 0 .../Loadouts/{ => Generic}/neck.yml | 0 .../Loadouts/{ => Generic}/outerClothing.yml | 0 .../Loadouts/{ => Generic}/satchels.yml | 28 - .../Loadouts/{ => Generic}/shoes.yml | 0 .../Loadouts/{ => Generic}/species.yml | 0 .../Loadouts/{ => Generic}/uniform.yml | 0 .../Jobs/{Heads => Command}/captain.yml | 0 .../{Heads => Command}/headOfPersonnel.yml | 0 .../command.yml => Command/uncategorized.yml} | 2 +- .../Engineering/atmosphericTechnician.yml | 107 +++ .../Jobs/Engineering/chiefEngineer.yml | 140 +++ .../Jobs/Engineering/seniorEngineer.yml | 109 +++ .../Jobs/Engineering/stationEngineer.yml | 108 +++ .../Jobs/Engineering/technicalAssistant.yml | 24 + .../Jobs/Engineering/uncategorized.yml | 175 ++++ .../Loadouts/Jobs/Epistemics/acolyte.yml | 0 .../Loadouts/Jobs/Epistemics/cataloger.yml | 126 +++ .../Loadouts/Jobs/Epistemics/chaplain.yml | 230 +++++ .../Loadouts/Jobs/Epistemics/golemancer.yml | 29 + .../mystagogue.yml} | 6 +- .../Loadouts/Jobs/Epistemics/mystic.yml | 53 ++ .../Loadouts/Jobs/Epistemics/noviciate.yml | 0 .../Jobs/Epistemics/psionicMantis.yml | 17 + .../Jobs/Epistemics/uncategorized.yml | 258 ++++++ .../Loadouts/Jobs/Heads/chiefEngineer.yml | 46 - .../Jobs/Logistics/cargoTechnician.yml | 32 + .../Loadouts/Jobs/Logistics/courier.yml | 0 .../logisticsOfficer.yml} | 0 .../salvageSpecialist.yml} | 35 +- .../Loadouts/Jobs/Logistics/uncategorized.yml | 0 .../Loadouts/Jobs/Medical/chemist.yml | 0 .../chiefMedicalOfficer.yml | 0 .../Loadouts/Jobs/Medical/medicalDoctor.yml | 0 .../Loadouts/Jobs/Medical/medicalIntern.yml | 0 .../Loadouts/Jobs/Medical/paramedic.yml | 0 .../uncategorized.yml} | 0 .../Loadouts/Jobs/Security/cadet.yml | 0 .../{Heads => Security}/headOfSecurity.yml | 0 .../Jobs/Security/securityOfficer.yml | 0 .../uncategorized.yml} | 0 .../Loadouts/Jobs/Security/warden.yml | 0 .../Loadouts/Jobs/Service/bartender.yml | 215 +++++ .../Loadouts/Jobs/Service/botanist.yml | 57 ++ .../Prototypes/Loadouts/Jobs/Service/chef.yml | 129 +++ .../Loadouts/Jobs/Service/clown.yml | 102 +++ .../Loadouts/Jobs/Service/janitor.yml | 42 + .../Loadouts/Jobs/Service/lawyer.yml | 112 +++ .../Prototypes/Loadouts/Jobs/Service/mime.yml | 84 ++ .../Loadouts/Jobs/Service/reporter.yml | 43 + .../Loadouts/Jobs/Service/uncategorized.yml | 47 + .../Prototypes/Loadouts/Jobs/engineering.yml | 194 ---- .../Prototypes/Loadouts/Jobs/science.yml | 713 --------------- .../Prototypes/Loadouts/Jobs/service.yml | 829 ------------------ .../Jobs/Engineering/senior_engineer.yml | 2 +- 61 files changed, 2247 insertions(+), 1903 deletions(-) rename Resources/Prototypes/Loadouts/{ => Generic}/backpacks.yml (89%) rename Resources/Prototypes/Loadouts/{ => Generic}/duffelbags.yml (87%) rename Resources/Prototypes/Loadouts/{ => Generic}/eyes.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/hands.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/head.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/items.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/mask.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/neck.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/outerClothing.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/satchels.yml (88%) rename Resources/Prototypes/Loadouts/{ => Generic}/shoes.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/species.yml (100%) rename Resources/Prototypes/Loadouts/{ => Generic}/uniform.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Heads => Command}/captain.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Heads => Command}/headOfPersonnel.yml (100%) rename Resources/Prototypes/Loadouts/Jobs/{Heads/command.yml => Command/uncategorized.yml} (97%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml rename Resources/Prototypes/Loadouts/Jobs/{Heads/researchDirector.yml => Epistemics/mystagogue.yml} (99%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml delete mode 100644 Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Logistics/courier.yml rename Resources/Prototypes/Loadouts/Jobs/{Heads/quarterMaster.yml => Logistics/logisticsOfficer.yml} (100%) rename Resources/Prototypes/Loadouts/Jobs/{cargo.yml => Logistics/salvageSpecialist.yml} (58%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml rename Resources/Prototypes/Loadouts/Jobs/{Heads => Medical}/chiefMedicalOfficer.yml (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml rename Resources/Prototypes/Loadouts/Jobs/{medical.yml => Medical/uncategorized.yml} (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/cadet.yml rename Resources/Prototypes/Loadouts/Jobs/{Heads => Security}/headOfSecurity.yml (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/securityOfficer.yml rename Resources/Prototypes/Loadouts/Jobs/{security.yml => Security/uncategorized.yml} (100%) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/warden.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/chef.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/clown.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/mime.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml delete mode 100644 Resources/Prototypes/Loadouts/Jobs/engineering.yml delete mode 100644 Resources/Prototypes/Loadouts/Jobs/science.yml delete mode 100644 Resources/Prototypes/Loadouts/Jobs/service.yml diff --git a/Resources/Prototypes/Loadouts/backpacks.yml b/Resources/Prototypes/Loadouts/Generic/backpacks.yml similarity index 89% rename from Resources/Prototypes/Loadouts/backpacks.yml rename to Resources/Prototypes/Loadouts/Generic/backpacks.yml index 5fd812380c5..d2aa38467ca 100644 --- a/Resources/Prototypes/Loadouts/backpacks.yml +++ b/Resources/Prototypes/Loadouts/Generic/backpacks.yml @@ -65,34 +65,6 @@ jobs: - Brigmedic -- type: loadout - id: LoadoutBackpackEngineering - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackEngineering - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Engineering - -- type: loadout - id: LoadoutBackpackAtmospherics - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackAtmospherics - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Engineering - - type: loadout id: LoadoutBackpackMedical category: Backpacks diff --git a/Resources/Prototypes/Loadouts/duffelbags.yml b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml similarity index 87% rename from Resources/Prototypes/Loadouts/duffelbags.yml rename to Resources/Prototypes/Loadouts/Generic/duffelbags.yml index 89997326f1a..9513ad60600 100644 --- a/Resources/Prototypes/Loadouts/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml @@ -51,34 +51,6 @@ jobs: - Brigmedic -- type: loadout - id: LoadoutBackpackDuffelEngineering - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelEngineering - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Engineering - -- type: loadout - id: LoadoutBackpackDuffelAtmospherics - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelAtmospherics - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Engineering - - type: loadout id: LoadoutBackpackDuffelMedical category: Backpacks diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/Generic/eyes.yml similarity index 100% rename from Resources/Prototypes/Loadouts/eyes.yml rename to Resources/Prototypes/Loadouts/Generic/eyes.yml diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml similarity index 100% rename from Resources/Prototypes/Loadouts/hands.yml rename to Resources/Prototypes/Loadouts/Generic/hands.yml diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml similarity index 100% rename from Resources/Prototypes/Loadouts/head.yml rename to Resources/Prototypes/Loadouts/Generic/head.yml diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/Generic/items.yml similarity index 100% rename from Resources/Prototypes/Loadouts/items.yml rename to Resources/Prototypes/Loadouts/Generic/items.yml diff --git a/Resources/Prototypes/Loadouts/mask.yml b/Resources/Prototypes/Loadouts/Generic/mask.yml similarity index 100% rename from Resources/Prototypes/Loadouts/mask.yml rename to Resources/Prototypes/Loadouts/Generic/mask.yml diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/Generic/neck.yml similarity index 100% rename from Resources/Prototypes/Loadouts/neck.yml rename to Resources/Prototypes/Loadouts/Generic/neck.yml diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/Generic/outerClothing.yml similarity index 100% rename from Resources/Prototypes/Loadouts/outerClothing.yml rename to Resources/Prototypes/Loadouts/Generic/outerClothing.yml diff --git a/Resources/Prototypes/Loadouts/satchels.yml b/Resources/Prototypes/Loadouts/Generic/satchels.yml similarity index 88% rename from Resources/Prototypes/Loadouts/satchels.yml rename to Resources/Prototypes/Loadouts/Generic/satchels.yml index 4f21dc7656f..90fce4cf1ac 100644 --- a/Resources/Prototypes/Loadouts/satchels.yml +++ b/Resources/Prototypes/Loadouts/Generic/satchels.yml @@ -64,34 +64,6 @@ jobs: - Brigmedic -- type: loadout - id: LoadoutBackpackSatchelEngineering - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelEngineering - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Engineering - -- type: loadout - id: LoadoutBackpackSatchelAtmospherics - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelAtmospherics - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Engineering - - type: loadout id: LoadoutBackpackSatchelMedical category: Backpacks diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/Generic/shoes.yml similarity index 100% rename from Resources/Prototypes/Loadouts/shoes.yml rename to Resources/Prototypes/Loadouts/Generic/shoes.yml diff --git a/Resources/Prototypes/Loadouts/species.yml b/Resources/Prototypes/Loadouts/Generic/species.yml similarity index 100% rename from Resources/Prototypes/Loadouts/species.yml rename to Resources/Prototypes/Loadouts/Generic/species.yml diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/Generic/uniform.yml similarity index 100% rename from Resources/Prototypes/Loadouts/uniform.yml rename to Resources/Prototypes/Loadouts/Generic/uniform.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml rename to Resources/Prototypes/Loadouts/Jobs/Command/captain.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml rename to Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/command.yml b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml similarity index 97% rename from Resources/Prototypes/Loadouts/Jobs/Heads/command.yml rename to Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml index ccc791460b6..a06972189c9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/command.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutCommandGlovesInspection category: JobsCommand - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterJobRequirement diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml new file mode 100644 index 00000000000..dd0591b17cf --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml @@ -0,0 +1,107 @@ +# Atmospheric Technician +# Backpacks +- type: loadout + id: LoadingEngineeringAtmosBackpackBackpack + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianBackpacks + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingBackpackAtmospherics + +- type: loadout + id: LoadingEngineeringAtmosBackpackSatchel + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianBackpacks + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingBackpackSatchelAtmospherics + +- type: loadout + id: LoadingEngineeringAtmosBackpackDuffel + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianBackpacks + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingBackpackDuffelAtmospherics + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Head + +# Id + +# Neck + +# Mask + +# Outer +- type: loadout + id: LoadoutEngineeringChickenSuit # :) + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianOuter + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingOuterSuitChicken + - ClothingHeadHatChickenhead + +# Shoes + +# Uniforms +- type: loadout + id: LoadingEngineeringAtmosUniformSuit + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianUniforms + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingUniformJumpsuitAtmos + +- type: loadout + id: LoadingEngineeringAtmosUniformSkirt + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianUniforms + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingUniformJumpskirtAtmos + diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml new file mode 100644 index 00000000000..40399216b50 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml @@ -0,0 +1,140 @@ +# Chief Engineer +# Backpacks +- type: loadout + id: LoadoutEngineeringChiefEngineerBackpackBackpack + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingBackpackChiefEngineerFilled + +- type: loadout + id: LoadoutEngineeringChiefEngineerBackpackSatchel + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingBackpackSatchelChiefEngineerFilled + +- type: loadout + id: LoadoutEngineeringChiefEngineerBackpackDuffel + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingBackpackDuffelChiefEngineerFilled + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Head + +# Id + +# Neck +- type: loadout + id: LoadoutEngineeringChiefEngineerNeckMantle + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingNeckMantleCE + +- type: loadout + id: LoadoutEngineeringChiefEngineerNeckCloak + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingNeckCloakCe + +# Mask + +# Outer +- type: loadout + id: LoadoutCommandCEOuterWinter + category: JobsEngineeringChiefEngineer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerOuter + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingOuterWinterCE + +# Shoes +- type: loadout + id: LoadoutChiefEngineerShoesBootsWinter + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerShoes + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingShoesBootsWinterChiefEngineer + +# Uniforms +- type: loadout + id: LoadoutChiefEngineerUniformSuit + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerUniforms + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingUniformJumpsuitChiefEngineer + +- type: loadout + id: LoadoutEngineeringChiefEngineerUniformSkirt + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerUniforms + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingUniformJumpskirtChiefEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml new file mode 100644 index 00000000000..fa5ef1b6f2f --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -0,0 +1,109 @@ +# Senior Engineer +# Backpacks +- type: loadout + id: LoadoutEngineeringSeniorEngineerBackpackBackpack + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - ClothingBackpackEngineeringFilled + +- type: loadout + id: LoadoutEngineeringSeniorEngineerBackpackSatchel + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - ClothingBackpackSatchelEngineeringFilled + +- type: loadout + id: LoadoutEngineeringSeniorEngineerBackpackDuffel + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - ClothingBackpackDuffelEngineeringFilled +# Belt + +# Ears + +# Equipment + +# Eyes + +# Head + +# Id + +# Mask + +# Neck + +# Outer + +# Shoes + +# Uniforms +- type: loadout + id: LoadoutEngineeringUniformJumpskirtSenior + category: JobsEngineeringSeniorEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerUniforms + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + - !type:CharacterPlaytimeRequirement + tracker: JobAtmosphericTechnician + min: 21600 # 6 hours + - !type:CharacterPlaytimeRequirement + tracker: JobStationEngineer + min: 21600 # 6 hours + - !type:CharacterDepartmentTimeRequirement + department: Engineering + min: 216000 # 60 hours + items: + - ClothingUniformJumpskirtSeniorEngineer + +- type: loadout + id: LoadoutEngineeringUniformJumpsuitSenior + category: JobsEngineeringSeniorEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerUniforms + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + - !type:CharacterPlaytimeRequirement + tracker: JobAtmosphericTechnician + min: 21600 # 6 hours + - !type:CharacterPlaytimeRequirement + tracker: JobStationEngineer + min: 21600 # 6 hours + - !type:CharacterDepartmentTimeRequirement + department: Engineering + min: 216000 # 60 hours + items: + - ClothingUniformJumpsuitSeniorEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml new file mode 100644 index 00000000000..ab17802c81e --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml @@ -0,0 +1,108 @@ +# Station Engineer +# Backpack +- type: loadout + id: LoadoutEngineeringStationEngineerBackpackBackpack + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutStationEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingBackpackEngineeringFilled + +- type: loadout + id: LoadoutEngineeringStationEngineerBackpackSatchel + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutStationEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingBackpackSatchelEngineeringFilled + +- type: loadout + id: LoadoutEngineeringStationEngineerBackpackDuffel + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutStationEngineerBackpacks + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingBackpackDuffelEngineeringFilled + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms +- type: loadout + id: LoadoutEngineeringUniformSuit + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsEngineering + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingUniformJumpsuitEngineering + +- type: loadout + id: LoadoutEngineeringUniformSkirt + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsEngineering + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingUniformJumpskirtEngineering + +- type: loadout + id: LoadoutEngineeringUniformHazard + category: JobsEngineeringStationEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsEngineering + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingUniformJumpsuitEngineeringHazard + +# Equipment diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml new file mode 100644 index 00000000000..34280d436e9 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml @@ -0,0 +1,24 @@ +# Technical Assistant +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml new file mode 100644 index 00000000000..9403eb15f7b --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml @@ -0,0 +1,175 @@ +# All Engineering Department Jobs +# Backpacks +- type: loadout + id: LoadoutBackpackEngineering + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackEngineering + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacksEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + +- type: loadout + id: LoadoutBackpackSatchelEngineering + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelEngineering + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacksEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + +- type: loadout + id: LoadoutBackpackDuffelEngineering + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelEngineering + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacksEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering +# Belt + +# Ears + +# Equipment + +# Eyes +- type: loadout + id: LoadoutEngineeringEyesMeson + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEyesEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingEyesGlassesMeson + +# Head +- type: loadout + id: LoadoutEngineeringHeadBeret + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingHeadHatBeretEngineering + +- type: loadout + id: LoadoutEngineeringHeadHardhatBlue + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingHeadHatHardhatBlue + +- type: loadout + id: LoadoutEngineeringHeadHardhatOrange + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingHeadHatHardhatOrange + +- type: loadout + id: LoadoutEngineeringHeadHardhatYellow + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingHeadHatHardhatYellow + +- type: loadout + id: LoadoutEngineeringHeadHardhatWhite + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingHeadHatHardhatWhite + +- type: loadout + id: LoadoutEngineeringHeadHardhatRed + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingHeadHatHardhatRed + +# Id + +# Neck + +# Mask + +# Outer +- type: loadout + id: LoadoutEngineeringOuterHazard + category: JobsEngineeringAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterEngineering + - !type:CharacterDepartmentRequirement + departments: + - Engineering + items: + - ClothingOuterVestHazard + +# Shoes + +# Uniforms + +# Equipment diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml new file mode 100644 index 00000000000..6385e3e9504 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml @@ -0,0 +1,126 @@ +# Cataloger +- type: loadout + id: LoadoutScienceJumpsuitLibrarianNt + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarianNt + +- type: loadout + id: LoadoutScienceJumpsuitLibrarianIdris + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarianIdris + +- type: loadout + id: LoadoutScienceJumpsuitLibrarianOrion + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarianOrion + +- type: loadout + id: LoadoutScienceJumpsuitLibrarianHeph + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarianHeph + +- type: loadout + id: LoadoutScienceJumpsuitLibrarianPMCG + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarianPMCG + +- type: loadout + id: LoadoutScienceJumpsuitLibrarianZav + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarianZav + +- type: loadout + id: LoadoutScienceJumpsuitLibrarianZeng + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarianZeng + +- type: loadout + id: LoadoutScienceJumpsuitLibrarian + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpsuitLibrarian + +- type: loadout + id: LoadoutScienceJumpskirtLibrarian + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCataloguerUniforms + - !type:CharacterJobRequirement + jobs: + - Librarian + items: + - ClothingUniformJumpskirtLibrarian diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml new file mode 100644 index 00000000000..4f29e4393f5 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml @@ -0,0 +1,230 @@ +# Chaplain +# Uniforms +- type: loadout + id: LoadoutChaplainJumpsuit + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChaplainUniforms + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingUniformJumpsuitChaplain + +- type: loadout + id: LoadoutChaplainJumpskirt + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChaplainUniforms + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingUniformJumpskirtChaplain + +- type: loadout + id: LoadoutScienceUniformJumpsuitMonasticRobeDark + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingUniformJumpsuitMonasticRobeDark + +- type: loadout + id: LoadoutScienceUniformJumpsuitMonasticRobeLight + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingUniformJumpsuitMonasticRobeLight + +# Outer +- type: loadout + id: LoadoutScienceOuterPlagueSuit + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingOuterPlagueSuit + +- type: loadout + id: LoadoutScienceOuterNunRobe + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingOuterNunRobe + +- type: loadout + id: LoadoutScienceOuterHoodieBlack + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingOuterHoodieBlack + +- type: loadout + id: LoadoutScienceOuterHoodieChaplain + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingOuterHoodieChaplain + +# Neck +- type: loadout + id: LoadoutScienceNeckStoleChaplain + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingNeckStoleChaplain + +# Head +- type: loadout + id: LoadoutScienceHeadHatHoodNunHood + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingHeadHatHoodNunHood + +- type: loadout + id: LoadoutScienceHeadHatPlaguedoctor + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingHeadHatPlaguedoctor + +- type: loadout + id: LoadoutScienceHeadHatWitch + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingHeadHatWitch + +- type: loadout + id: LoadoutScienceHeadHatWitch1 + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingHeadHatWitch1 + +# Mask +- type: loadout + id: LoadoutScienceMaskPlague + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMaskScience + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - ClothingMaskPlague + +# Equipment +- type: loadout + id: LoadoutChaplainBible + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChaplainEquipment + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - Bible + +- type: loadout + id: LoadoutChaplainStamp + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChaplainEquipment + - !type:CharacterJobRequirement + jobs: + - Chaplain + items: + - RubberStampChaplain diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml new file mode 100644 index 00000000000..8e381cd9c71 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml @@ -0,0 +1,29 @@ +# Golemancer +# Uniforms +- type: loadout + id: LoadoutScienceUniformJumpskirtRoboticist + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingUniformJumpskirtRoboticist + +- type: loadout + id: LoadoutScienceUniformJumpsuitRoboticist + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingUniformJumpsuitRoboticist diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml similarity index 99% rename from Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml rename to Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml index 0ec43fc3a77..fcd6ce1dd5c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml @@ -1,9 +1,8 @@ # Outer - - type: loadout id: LoadoutCommandRDOuterWinter category: JobsCommand - cost: 1 + cost: 0 requirements: - !type:CharacterJobRequirement jobs: @@ -23,7 +22,6 @@ - ClothingOuterCoatRndMysta # Head - - type: loadout id: LoadoutCommandRDHeadHatBeretMysta category: JobsCommand @@ -49,7 +47,6 @@ - ClothingHeadHoodMysta # Neck - - type: loadout id: LoadoutCommandRDNeckMantle category: JobsCommand @@ -87,7 +84,6 @@ - ClothingNeckCloakMystagogue # Shoes - - type: loadout id: LoadoutCommandRDShoesBootsWinter category: JobsCommand diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml new file mode 100644 index 00000000000..63579495acb --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml @@ -0,0 +1,53 @@ +# Mystic +# Uniforms +- type: loadout + id: LoadoutScienceUniformJumpskirtSenior + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + - !type:CharacterDepartmentTimeRequirement + department: Epistemics + min: 216000 # 60 hours + items: + - ClothingUniformJumpskirtSeniorResearcher + +- type: loadout + id: LoadoutScienceUniformJumpsuitSenior + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + - !type:CharacterDepartmentTimeRequirement + department: Epistemics + min: 216000 # 60 hours + items: + - ClothingUniformJumpsuitSeniorResearcher + +# Outer +- type: loadout + id: LoadoutScienceOuterLabcoatSeniorResearcher + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + - !type:CharacterDepartmentTimeRequirement + department: Epistemics + min: 216000 # 60 hours + items: + - ClothingOuterCoatLabSeniorResearcher diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml new file mode 100644 index 00000000000..f4e44d4542a --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml @@ -0,0 +1,17 @@ +# Psionic Mantis +# Uniforms + +# Outer +- type: loadout + id: LoadoutScienceOuterWinterCoatMantis + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterJobRequirement + jobs: + - ForensicMantis + items: + - ClothingOuterWinterCoatMantis diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml new file mode 100644 index 00000000000..4df077b232d --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -0,0 +1,258 @@ +# Uniforms +# Outer +- type: loadout + id: LoadoutScienceOuterCoat + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingOuterCoatRnd + +- type: loadout + id: LoadoutScienceOuterLabcoat + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingOuterCoatLab + +- type: loadout + id: LoadoutSciencegOuterCoatRobo + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingOuterCoatRobo + +- type: loadout + id: LoadoutScienceOuterWinterSci + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingOuterWinterSci + +- type: loadout + id: LoadoutScienceOuterExplorerLabcoat + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingOuterExplorerCoat + +# Gloves +- type: loadout + id: LoadoutScienceHandsGlovesColorPurple + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutGlovesScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingHandsGlovesColorPurple + +- type: loadout + id: LoadoutScienceHandsGlovesLatex + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutGlovesScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingHandsGlovesLatex + +- type: loadout + id: LoadoutScienceHandsGlovesRobohands + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutGlovesScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingHandsGlovesRobohands + +# Neck +- type: loadout + id: LoadoutScienceNeckTieSci + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingNeckTieSci + +- type: loadout + id: LoadoutScienceNeckScarfStripedPurple + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingNeckScarfStripedPurple + +- type: loadout + id: LoadoutScienceNeckScarfStripedBlack + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingNeckScarfStripedBlack + +# Head +- type: loadout + id: LoadoutScienceHeadHatBeret + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingHeadHatBeretRND + +- type: loadout + id: LoadoutScienceHeadHatFez + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingHeadHatFez + +# Eyes +- type: loadout + id: LoadoutScienceEyesHudDiagnostic + category: JobsScience + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEyesScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingEyesHudDiagnostic + +- type: loadout + id: LoadoutScienceEyesEyepatchHudDiag + category: JobsScience + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEyesScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingEyesEyepatchHudDiag + +# Shoes +- type: loadout + id: LoadoutScienceShoesBootsWinterSci + category: JobsScience + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutShoesScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + items: + - ClothingShoesBootsWinterSci + +# Robes +- type: loadout + id: LoadoutOuterRobeTechPriest + category: Outer + cost: 0 + items: + - ClothingOuterRobeTechPriest + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + +- type: loadout + id: LoadoutHeadHoodTechPriest + category: Head + cost: 0 + exclusive: true + items: + - ClothingHeadTechPriest + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadScience + - !type:CharacterDepartmentRequirement + departments: + - Epistemics diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml deleted file mode 100644 index bfddc6e383e..00000000000 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml +++ /dev/null @@ -1,46 +0,0 @@ -- type: loadout - id: LoadoutCommandCENeckMantle - category: JobsCommand - cost: 0 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - ChiefEngineer - items: - - ClothingNeckMantleCE - -- type: loadout - id: LoadoutCommandCENeckCloak - category: JobsCommand - cost: 0 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - ChiefEngineer - items: - - ClothingNeckCloakCe - -- type: loadout - id: LoadoutCommandCEOuterWinter - category: JobsCommand - cost: 1 - requirements: - - !type:CharacterJobRequirement - jobs: - - ChiefEngineer - items: - - ClothingOuterWinterCE - -- type: loadout - id: LoadoutCommandCEShoesBootsWinter - category: JobsCommand - cost: 0 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - ChiefEngineer - items: - - ClothingShoesBootsWinterChiefEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml new file mode 100644 index 00000000000..77ec83a522c --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml @@ -0,0 +1,32 @@ +# Cargo technician +# Uniforms + +# Outer +- type: loadout + id: LoadoutCargoOuterWinterCargo + category: JobsCargo + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterCargo + - !type:CharacterJobRequirement + jobs: + - CargoTechnician + items: + - ClothingOuterWinterCargo + +# Shoes +- type: loadout + id: LoadoutCargoShoesBootsWinterCargo + category: JobsCargo + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutShoesCargo + - !type:CharacterJobRequirement + jobs: + - CargoTechnician + items: + - ClothingShoesBootsWinterCargo diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/courier.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/courier.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml rename to Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml similarity index 58% rename from Resources/Prototypes/Loadouts/Jobs/cargo.yml rename to Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index 7e9c525e409..fe8e7e00487 100644 --- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -1,34 +1,7 @@ -# Cargo technician -- type: loadout - id: LoadoutCargoOuterWinterCargo - category: JobsCargo - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterCargo - - !type:CharacterJobRequirement - jobs: - - CargoTechnician - items: - - ClothingOuterWinterCargo - -- type: loadout - id: LoadoutCargoShoesBootsWinterCargo - category: JobsCargo - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoesCargo - - !type:CharacterJobRequirement - jobs: - - CargoTechnician - items: - - ClothingShoesBootsWinterCargo - -# Salvage specialist +# Salvage Specialist +# Uniforms +# Outer - type: loadout id: LoadoutCargoOuterWinterMiner category: JobsCargo @@ -43,6 +16,7 @@ items: - ClothingOuterWinterMiner +# Neck - type: loadout id: LoadoutCargoNeckGoliathCloak category: JobsCargo @@ -60,6 +34,7 @@ items: - ClothingNeckCloakGoliathCloak +# Weapons - type: loadout id: LoadoutCargoWeaponsCrusherDagger category: JobsCargo diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml rename to Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/medical.yml rename to Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/cadet.yml b/Resources/Prototypes/Loadouts/Jobs/Security/cadet.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml rename to Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/securityOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/securityOfficer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/security.yml rename to Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml new file mode 100644 index 00000000000..deb5125ea19 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml @@ -0,0 +1,215 @@ +# Bartender +# Uniforms +- type: loadout + id: LoadoutServiceBartenderUniformPurple + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingUniformJumpsuitBartenderPurple + +- type: loadout + id: LoadoutServiceJumpsuitBartenderNt + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderUniforms + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingUniformJumpsuitBartenderNt + +- type: loadout + id: LoadoutServiceJumpsuitBartenderIdris + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderUniforms + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingUniformJumpsuitBartenderIdris + +- type: loadout + id: LoadoutServiceJumpsuitBartenderOrion + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderUniforms + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingUniformJumpsuitBartenderOrion + +# Outer +- type: loadout + id: LoadoutServiceBartenderArmorDuraVest + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderOuterwear + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingOuterArmorDuraVest + +- type: loadout + id: LoadoutServiceOuterBartenderNt + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderOuterwear + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingOuterVestNt + +- type: loadout + id: LoadoutServiceOuterBartenderIdris + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderOuterwear + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingOuterVestIdris + +- type: loadout + id: LoadoutServiceOuterBartenderOrion + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderOuterwear + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingOuterVestOrion + +# Ammo +- type: loadout + id: LoadoutServiceBartenderBoxBeanbags + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderAmmo + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - BoxBeanbag + +- type: loadout + id: LoadoutServiceBartenderBoxLightRifleRubber + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderAmmo + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - MagazineBoxLightRifleRubber + +# Weapons +- type: loadout + id: LoadoutServiceBartenderShotgunDoubleBarreledRubber + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - WeaponShotgunDoubleBarreledRubber + +- type: loadout + id: LoadoutServiceBartenderMosinRubber + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - WeaponSniperMosinRubber + +# Head +- type: loadout + id: LoadoutServiceHeadBartenderNt + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderHead + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingHeadHatFlatcapBartenderNanotrasen + +- type: loadout + id: LoadoutServiceHeadBartenderIdris + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderHead + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingHeadHatFlatcapBartenderIdris + +- type: loadout + id: LoadoutServiceHeadBartenderOrion + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderHead + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - ClothingHeadHatFlatcapBartenderOrion diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml new file mode 100644 index 00000000000..9d9af12ef3e --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml @@ -0,0 +1,57 @@ +# Botanist +# Uniforms +- type: loadout + id: LoadoutServiceBotanistUniformOveralls + category: JobsServiceBotanist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Botanist + items: + - ClothingUniformOveralls + +- type: loadout + id: LoadoutServiceJumpsuitHydroponicsNt + category: JobsServiceBotanist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBotanistUniforms + - !type:CharacterJobRequirement + jobs: + - Botanist + items: + - ClothingUniformJumpsuitHydroponicsNt + +- type: loadout + id: LoadoutServiceJumpsuitHydroponicsIdris + category: JobsServiceBotanist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBotanistUniforms + - !type:CharacterJobRequirement + jobs: + - Botanist + items: + - ClothingUniformJumpsuitHydroponicsIdris + +- type: loadout + id: LoadoutServiceJumpsuitHydroponicsOrion + category: JobsServiceBotanist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBotanistUniforms + - !type:CharacterJobRequirement + jobs: + - Botanist + items: + - ClothingUniformJumpsuitHydroponicsOrion diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml new file mode 100644 index 00000000000..766e803d070 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml @@ -0,0 +1,129 @@ +# Chef +# Uniforms +- type: loadout + id: LoadoutServiceJumpsuitChefNt + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefUniforms + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingUniformJumpsuitChefNt + +- type: loadout + id: LoadoutServiceJumpsuitChefIdris + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefUniforms + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingUniformJumpsuitChefIdris + +- type: loadout + id: LoadoutServiceJumpsuitChefOrion + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefUniforms + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingUniformJumpsuitChefOrion + +# Head +- type: loadout + id: LoadoutServiceHeadChefNt + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefHead + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingHeadHatChefNt + +- type: loadout + id: LoadoutServiceHeadChefIdris + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefHead + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingHeadHatChefIdris + +- type: loadout + id: LoadoutServiceHeadChefOrion + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefHead + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingHeadHatChefOrion + +# Outer +- type: loadout + id: LoadoutServiceOuterChefNt + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefOuter + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingOuterJacketChefNt + +- type: loadout + id: LoadoutServiceOuterChefIdris + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefOuter + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingOuterJacketChefIdris + +- type: loadout + id: LoadoutServiceOuterChefOrion + category: JobsServiceChef + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChefOuter + - !type:CharacterJobRequirement + jobs: + - Chef + items: + - ClothingOuterJacketChefOrion diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml new file mode 100644 index 00000000000..632df35ae4a --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml @@ -0,0 +1,102 @@ +# Clown +- type: loadout + id: LoadoutServiceClownOutfitJester + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - ClothingUniformJumpsuitJester + - ClothingHeadHatJester + - ClothingShoesJester + +- type: loadout + id: LoadoutServiceClownOutfitJesterAlt + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - ClothingUniformJumpsuitJesterAlt + - ClothingHeadHatJesterAlt + - ClothingShoesJester + +- type: loadout + id: LoadoutServiceClownOuterWinter + category: JobsServiceUncategorized + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterService + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - ClothingOuterWinterClown + +- type: loadout + id: LoadoutServiceClownOuterClownPriest + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterService + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - ClothingOuterClownPriest + +- type: loadout + id: LoadoutServiceClownBootsWinter + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutShoesService + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - ClothingShoesBootsWinterClown + +- type: loadout + id: LoadoutServiceClownMaskSexy + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMaskService + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - ClothingMaskSexyClown + +- type: loadout + id: LoadoutServiceClownBedsheetClown + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckService + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - BedsheetClown diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml new file mode 100644 index 00000000000..207e9034a75 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml @@ -0,0 +1,42 @@ +# Janitor +- type: loadout + id: LoadoutServiceJumpsuitJanitorNt + category: JobsServiceJanitor + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutJanitorUniforms + - !type:CharacterJobRequirement + jobs: + - Janitor + items: + - ClothingUniformJumpsuitJanitorNt + +- type: loadout + id: LoadoutServiceJumpsuitJanitorIdris + category: JobsServiceJanitor + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutJanitorUniforms + - !type:CharacterJobRequirement + jobs: + - Janitor + items: + - ClothingUniformJumpsuitJanitorIdris + +- type: loadout + id: LoadoutServiceJumpsuitJanitorOrion + category: JobsServiceJanitor + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutJanitorUniforms + - !type:CharacterJobRequirement + jobs: + - Janitor + items: + - ClothingUniformJumpsuitJanitorOrion diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml new file mode 100644 index 00000000000..528e1f86c74 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml @@ -0,0 +1,112 @@ +# Lawyer +- type: loadout + id: LoadoutServiceLawyerUniformBlueSuit + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpsuitLawyerBlue + +- type: loadout + id: LoadoutServiceLawyerUniformBlueSkirt + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpskirtLawyerBlue + +- type: loadout + id: LoadoutServiceLawyerUniformRedSuit + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpsuitLawyerRed + +- type: loadout + id: LoadoutServiceLawyerUniformRedSkirt + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpskirtLawyerRed + +- type: loadout + id: LoadoutServiceLawyerUniformPurpleSuit + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpsuitLawyerPurple + +- type: loadout + id: LoadoutServiceLawyerUniformPurpleSkirt + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpskirtLawyerPurple + +- type: loadout + id: LoadoutServiceLawyerUniformGoodSuit + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpsuitLawyerGood + +- type: loadout + id: LoadoutServiceLawyerUniformGoodSkirt + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Lawyer + items: + - ClothingUniformJumpskirtLawyerGood diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml new file mode 100644 index 00000000000..6b403813a38 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml @@ -0,0 +1,84 @@ +# Mime +- type: loadout + id: LoadoutServiceMimeOuterWinter + category: JobsServiceUncategorized + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterService + - !type:CharacterJobRequirement + jobs: + - Mime + items: + - ClothingOuterWinterMime + +- type: loadout + id: LoadoutServiceMimeMaskSad + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMaskService + - !type:CharacterJobRequirement + jobs: + - Mime + items: + - ClothingMaskSadMime + +- type: loadout + id: LoadoutServiceMimeMaskScared + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMaskService + - !type:CharacterJobRequirement + jobs: + - Mime + items: + - ClothingMaskScaredMime + +- type: loadout + id: LoadoutServiceMimeMaskSexy + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMaskService + - !type:CharacterJobRequirement + jobs: + - Mime + items: + - ClothingMaskSexyMime + +- type: loadout + id: LoadoutServiceMimeShoesBootsWinter + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutShoesService + - !type:CharacterJobRequirement + jobs: + - Mime + items: + - ClothingShoesBootsWinterMime + +- type: loadout + id: LoadoutServiceMimeBedsheetMime + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckService + - !type:CharacterJobRequirement + jobs: + - Mime + items: + - BedsheetMime diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml new file mode 100644 index 00000000000..a7190e39aca --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml @@ -0,0 +1,43 @@ +# Reporter +# Uniforms +- type: loadout + id: LoadoutServiceReporterUniformDetectivesuit + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Reporter + items: + - ClothingUniformJumpsuitDetective + +- type: loadout + id: LoadoutServiceReporterUniformDetectiveskirt + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Reporter + items: + - ClothingUniformJumpskirtDetective + +- type: loadout + id: LoadoutServiceReporterUniformJournalist + category: JobsServiceUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsService + - !type:CharacterJobRequirement + jobs: + - Reporter + items: + - ClothingUniformJumpsuitJournalist diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml new file mode 100644 index 00000000000..ebde55c37a9 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml @@ -0,0 +1,47 @@ +# For the most part we dont want people to take this item, so its used as an example of all the things +# you can do with requirements. Point someone to this thing if they ask "how tf do loadout requirements work?" + +- type: loadout + id: LoadoutServiceClownCowToolboxFilled + category: JobsServiceUncategorized + cost: 2 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEquipmentService + - !type:CharacterLogicXorRequirement + requirements: + - !type:CharacterLogicAndRequirement + requirements: + - !type:CharacterSexRequirement + sex: Male + - !type:CharacterSpeciesRequirement + species: + - Felinid + - !type:CharacterHeightRequirement + min: 110 + max: 122 + - !type:CharacterGenderRequirement + gender: Female + - !type:CharacterTraitRequirement + traits: + - HeavyweightDrunk + - !type:CharacterLogicAndRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Harpy + - !type:CharacterHeightRequirement + min: 170 + - !type:CharacterWeightRequirement + min: 20 + - !type:CharacterSexRequirement + sex: Male + - !type:CharacterJobRequirement + inverted: true # This is the equivalent of !(condition) + jobs: + - Clown + - !type:CharacterJobRequirement + jobs: + - Clown + items: + - CowToolboxFilled diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml deleted file mode 100644 index 2bf857c85fb..00000000000 --- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml +++ /dev/null @@ -1,194 +0,0 @@ -- type: loadout - id: LoadoutEngineeringUniformHazard - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - items: - - ClothingUniformJumpsuitEngineeringHazard - -- type: loadout - id: LoadoutEngineeringOuterHazard - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - items: - - ClothingOuterVestHazard - -- type: loadout - id: LoadoutEngineeringUniformJumpskirtSenior - category: JobsEngineering - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobStationEngineer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 216000 # 60 hours - items: - - ClothingUniformJumpskirtSeniorEngineer - -- type: loadout - id: LoadoutEngineeringUniformJumpsuitSenior - category: JobsEngineering - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobStationEngineer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 216000 # 60 hours - items: - - ClothingUniformJumpsuitSeniorEngineer - -- type: loadout - id: LoadoutEngineeringChickenSuit # :) - category: JobsEngineering - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterEngineering - - !type:CharacterJobRequirement - jobs: - - AtmosphericTechnician - items: - - ClothingOuterSuitChicken - - ClothingHeadHatChickenhead - -- type: loadout - id: LoadoutEngineeringEyesMeson - category: JobsEngineering - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutEyesEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - items: - - ClothingEyesGlassesMeson - -- type: loadout - id: LoadoutEngineeringHeadBeret - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - - ChiefEngineer - items: - - ClothingHeadHatBeretEngineering - -- type: loadout - id: LoadoutEngineeringHeadHardhatBlue - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - items: - - ClothingHeadHatHardhatBlue - -- type: loadout - id: LoadoutEngineeringHeadHardhatOrange - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - items: - - ClothingHeadHatHardhatOrange - -- type: loadout - id: LoadoutEngineeringHeadHardhatYellow - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - items: - - ClothingHeadHatHardhatYellow - -- type: loadout - id: LoadoutEngineeringHeadHardhatWhite - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - items: - - ClothingHeadHatHardhatWhite - -- type: loadout - id: LoadoutEngineeringHeadHardhatRed - category: JobsEngineering - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - AtmosphericTechnician - items: - - ClothingHeadHatHardhatRed diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml deleted file mode 100644 index 3f376ec872d..00000000000 --- a/Resources/Prototypes/Loadouts/Jobs/science.yml +++ /dev/null @@ -1,713 +0,0 @@ -# Uniforms - -- type: loadout - id: LoadoutScienceUniformJumpskirtSenior - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours - items: - - ClothingUniformJumpskirtSeniorResearcher - -- type: loadout - id: LoadoutScienceUniformJumpsuitSenior - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours - items: - - ClothingUniformJumpsuitSeniorResearcher - -- type: loadout - id: LoadoutScienceUniformJumpskirtRoboticist - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingUniformJumpskirtRoboticist - -- type: loadout - id: LoadoutScienceUniformJumpsuitRoboticist - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingUniformJumpsuitRoboticist - -- type: loadout - id: LoadoutScienceUniformJumpsuitMonasticRobeDark - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingUniformJumpsuitMonasticRobeDark - -- type: loadout - id: LoadoutScienceUniformJumpsuitMonasticRobeLight - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingUniformJumpsuitMonasticRobeLight - -# Outer - -- type: loadout - id: LoadoutScienceOuterCoat - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingOuterCoatRnd - -- type: loadout - id: LoadoutScienceOuterLabcoat - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingOuterCoatLab - -- type: loadout - id: LoadoutSciencegOuterCoatRobo - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingOuterCoatRobo - -- type: loadout - id: LoadoutScienceOuterWinterSci - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingOuterWinterSci - -- type: loadout - id: LoadoutScienceOuterLabcoatSeniorResearcher - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours - items: - - ClothingOuterCoatLabSeniorResearcher - -- type: loadout - id: LoadoutScienceOuterExplorerLabcoat - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingOuterExplorerCoat - -- type: loadout - id: LoadoutScienceOuterPlagueSuit - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingOuterPlagueSuit - -- type: loadout - id: LoadoutScienceOuterNunRobe - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingOuterNunRobe - -- type: loadout - id: LoadoutScienceOuterHoodieBlack - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingOuterHoodieBlack - -- type: loadout - id: LoadoutScienceOuterHoodieChaplain - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingOuterHoodieChaplain - -- type: loadout - id: LoadoutScienceOuterWinterCoatMantis - category: JobsScience - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterJobRequirement - jobs: - - ForensicMantis - items: - - ClothingOuterWinterCoatMantis - -# Gloves - -- type: loadout - id: LoadoutScienceHandsGlovesColorPurple - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingHandsGlovesColorPurple - -- type: loadout - id: LoadoutScienceHandsGlovesLatex - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingHandsGlovesLatex - -- type: loadout - id: LoadoutScienceHandsGlovesRobohands - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingHandsGlovesRobohands - -# Neck - -- type: loadout - id: LoadoutScienceNeckTieSci - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingNeckTieSci - -- type: loadout - id: LoadoutScienceNeckScarfStripedPurple - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingNeckScarfStripedPurple - -- type: loadout - id: LoadoutScienceNeckStoleChaplain - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingNeckStoleChaplain - -- type: loadout - id: LoadoutScienceNeckScarfStripedBlack - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingNeckScarfStripedBlack - -# Mask - -- type: loadout - id: LoadoutScienceMaskPlague - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMaskScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingMaskPlague - -# Head - -- type: loadout - id: LoadoutScienceHeadHatBeret - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingHeadHatBeretRND - -- type: loadout - id: LoadoutScienceHeadHatFez - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingHeadHatFez - -- type: loadout - id: LoadoutScienceHeadHatHoodNunHood - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingHeadHatHoodNunHood - -- type: loadout - id: LoadoutScienceHeadHatPlaguedoctor - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingHeadHatPlaguedoctor - -- type: loadout - id: LoadoutScienceHeadHatWitch - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingHeadHatWitch - -- type: loadout - id: LoadoutScienceHeadHatWitch1 - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingHeadHatWitch1 - -# Eyes - -- type: loadout - id: LoadoutScienceEyesHudDiagnostic - category: JobsScience - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutEyesScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingEyesHudDiagnostic - -- type: loadout - id: LoadoutScienceEyesEyepatchHudDiag - category: JobsScience - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutEyesScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingEyesEyepatchHudDiag - -# Shoes - -- type: loadout - id: LoadoutScienceShoesBootsWinterSci - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoesScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - items: - - ClothingShoesBootsWinterSci - -# Robes - -- type: loadout - id: LoadoutOuterRobeTechPriest - category: Outer - cost: 0 - items: - - ClothingOuterRobeTechPriest - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - -- type: loadout - id: LoadoutHeadHoodTechPriest - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadTechPriest - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - -# Cataloguer -- type: loadout - id: LoadoutScienceJumpsuitLibrarianNt - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarianNt - -- type: loadout - id: LoadoutScienceJumpsuitLibrarianIdris - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarianIdris - -- type: loadout - id: LoadoutScienceJumpsuitLibrarianOrion - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarianOrion - -- type: loadout - id: LoadoutScienceJumpsuitLibrarianHeph - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarianHeph - -- type: loadout - id: LoadoutScienceJumpsuitLibrarianPMCG - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarianPMCG - -- type: loadout - id: LoadoutScienceJumpsuitLibrarianZav - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarianZav - -- type: loadout - id: LoadoutScienceJumpsuitLibrarianZeng - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarianZeng - -- type: loadout - id: LoadoutScienceJumpsuitLibrarian - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpsuitLibrarian - -- type: loadout - id: LoadoutScienceJumpskirtLibrarian - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms - - !type:CharacterJobRequirement - jobs: - - Librarian - items: - - ClothingUniformJumpskirtLibrarian - -# Chaplain -- type: loadout - id: LoadoutChaplainJumpsuit - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChaplainUniforms - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingUniformJumpsuitChaplain - -- type: loadout - id: LoadoutChaplainJumpskirt - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChaplainUniforms - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - ClothingUniformJumpskirtChaplain - -- type: loadout - id: LoadoutChaplainBible - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChaplainEquipment - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - Bible - -- type: loadout - id: LoadoutChaplainStamp - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChaplainEquipment - - !type:CharacterJobRequirement - jobs: - - Chaplain - items: - - RubberStampChaplain diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml deleted file mode 100644 index c0f04ef151a..00000000000 --- a/Resources/Prototypes/Loadouts/Jobs/service.yml +++ /dev/null @@ -1,829 +0,0 @@ -# Clown -- type: loadout - id: LoadoutServiceClownOutfitJester - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - ClothingUniformJumpsuitJester - - ClothingHeadHatJester - - ClothingShoesJester - -- type: loadout - id: LoadoutServiceClownOutfitJesterAlt - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - ClothingUniformJumpsuitJesterAlt - - ClothingHeadHatJesterAlt - - ClothingShoesJester - -- type: loadout - id: LoadoutServiceClownOuterWinter - category: JobsServiceUncategorized - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterService - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - ClothingOuterWinterClown - -- type: loadout - id: LoadoutServiceClownOuterClownPriest - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterService - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - ClothingOuterClownPriest - -- type: loadout - id: LoadoutServiceClownBootsWinter - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoesService - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - ClothingShoesBootsWinterClown - -- type: loadout - id: LoadoutServiceClownMaskSexy - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMaskService - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - ClothingMaskSexyClown - -- type: loadout - id: LoadoutServiceClownBedsheetClown - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckService - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - BedsheetClown - -# For the most part we dont want people to take this item, so its used as an example of all the things -# you can do with requirements. Point someone to this thing if they ask "how tf do loadout requirements work?" - -- type: loadout - id: LoadoutServiceClownCowToolboxFilled - category: JobsServiceUncategorized - cost: 2 - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentService - - !type:CharacterLogicXorRequirement - requirements: - - !type:CharacterLogicAndRequirement - requirements: - - !type:CharacterSexRequirement - sex: Male - - !type:CharacterSpeciesRequirement - species: - - Felinid - - !type:CharacterHeightRequirement - min: 110 - max: 122 - - !type:CharacterGenderRequirement - gender: Female - - !type:CharacterTraitRequirement - traits: - - HeavyweightDrunk - - !type:CharacterLogicAndRequirement - requirements: - - !type:CharacterSpeciesRequirement - species: - - Harpy - - !type:CharacterHeightRequirement - min: 170 - - !type:CharacterWeightRequirement - min: 20 - - !type:CharacterSexRequirement - sex: Male - - !type:CharacterJobRequirement - inverted: true # This is the equivalent of !(condition) - jobs: - - Clown - - !type:CharacterJobRequirement - jobs: - - Clown - items: - - CowToolboxFilled - -# Mime -- type: loadout - id: LoadoutServiceMimeOuterWinter - category: JobsServiceUncategorized - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterService - - !type:CharacterJobRequirement - jobs: - - Mime - items: - - ClothingOuterWinterMime - -- type: loadout - id: LoadoutServiceMimeMaskSad - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMaskService - - !type:CharacterJobRequirement - jobs: - - Mime - items: - - ClothingMaskSadMime - -- type: loadout - id: LoadoutServiceMimeMaskScared - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMaskService - - !type:CharacterJobRequirement - jobs: - - Mime - items: - - ClothingMaskScaredMime - -- type: loadout - id: LoadoutServiceMimeMaskSexy - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMaskService - - !type:CharacterJobRequirement - jobs: - - Mime - items: - - ClothingMaskSexyMime - -- type: loadout - id: LoadoutServiceMimeShoesBootsWinter - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoesService - - !type:CharacterJobRequirement - jobs: - - Mime - items: - - ClothingShoesBootsWinterMime - -- type: loadout - id: LoadoutServiceMimeBedsheetMime - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckService - - !type:CharacterJobRequirement - jobs: - - Mime - items: - - BedsheetMime - -# Bartender -- type: loadout - id: LoadoutServiceBartenderUniformPurple - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingUniformJumpsuitBartenderPurple - -- type: loadout - id: LoadoutServiceBartenderArmorDuraVest - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingOuterArmorDuraVest - -- type: loadout - id: LoadoutServiceBartenderBoxBeanbags - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderAmmo - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - BoxBeanbag - -- type: loadout - id: LoadoutServiceBartenderBoxLightRifleRubber - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderAmmo - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - MagazineBoxLightRifleRubber - -- type: loadout - id: LoadoutServiceBartenderShotgunDoubleBarreledRubber - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderWeapon - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - WeaponShotgunDoubleBarreledRubber - -- type: loadout - id: LoadoutServiceBartenderMosinRubber - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderWeapon - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - WeaponSniperMosinRubber - -- type: loadout - id: LoadoutServiceJumpsuitBartenderNt - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderUniforms - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingUniformJumpsuitBartenderNt - -- type: loadout - id: LoadoutServiceJumpsuitBartenderIdris - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderUniforms - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingUniformJumpsuitBartenderIdris - -- type: loadout - id: LoadoutServiceJumpsuitBartenderOrion - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderUniforms - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingUniformJumpsuitBartenderOrion - -- type: loadout - id: LoadoutServiceHeadBartenderNt - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderHead - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingHeadHatFlatcapBartenderNanotrasen - -- type: loadout - id: LoadoutServiceHeadBartenderIdris - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderHead - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingHeadHatFlatcapBartenderIdris - -- type: loadout - id: LoadoutServiceHeadBartenderOrion - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderHead - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingHeadHatFlatcapBartenderOrion - -- type: loadout - id: LoadoutServiceOuterBartenderNt - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingOuterVestNt - -- type: loadout - id: LoadoutServiceOuterBartenderIdris - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingOuterVestIdris - -- type: loadout - id: LoadoutServiceOuterBartenderOrion - category: JobsServiceBartender - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear - - !type:CharacterJobRequirement - jobs: - - Bartender - items: - - ClothingOuterVestOrion - -# Botanist -- type: loadout - id: LoadoutServiceBotanistUniformOveralls - category: JobsServiceBotanist - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Botanist - items: - - ClothingUniformOveralls - -- type: loadout - id: LoadoutServiceJumpsuitHydroponicsNt - category: JobsServiceBotanist - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBotanistUniforms - - !type:CharacterJobRequirement - jobs: - - Botanist - items: - - ClothingUniformJumpsuitHydroponicsNt - -- type: loadout - id: LoadoutServiceJumpsuitHydroponicsIdris - category: JobsServiceBotanist - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBotanistUniforms - - !type:CharacterJobRequirement - jobs: - - Botanist - items: - - ClothingUniformJumpsuitHydroponicsIdris - -- type: loadout - id: LoadoutServiceJumpsuitHydroponicsOrion - category: JobsServiceBotanist - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBotanistUniforms - - !type:CharacterJobRequirement - jobs: - - Botanist - items: - - ClothingUniformJumpsuitHydroponicsOrion - -# Lawyer -- type: loadout - id: LoadoutServiceLawyerUniformBlueSuit - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpsuitLawyerBlue - -- type: loadout - id: LoadoutServiceLawyerUniformBlueSkirt - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpskirtLawyerBlue - -- type: loadout - id: LoadoutServiceLawyerUniformRedSuit - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpsuitLawyerRed - -- type: loadout - id: LoadoutServiceLawyerUniformRedSkirt - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpskirtLawyerRed - -- type: loadout - id: LoadoutServiceLawyerUniformPurpleSuit - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpsuitLawyerPurple - -- type: loadout - id: LoadoutServiceLawyerUniformPurpleSkirt - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpskirtLawyerPurple - -- type: loadout - id: LoadoutServiceLawyerUniformGoodSuit - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpsuitLawyerGood - -- type: loadout - id: LoadoutServiceLawyerUniformGoodSkirt - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Lawyer - items: - - ClothingUniformJumpskirtLawyerGood - -- type: loadout - id: LoadoutServiceReporterUniformJournalist - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Reporter - items: - - ClothingUniformJumpsuitJournalist - -# Reporter -- type: loadout - id: LoadoutServiceReporterUniformDetectivesuit - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Reporter - items: - - ClothingUniformJumpsuitDetective - -- type: loadout - id: LoadoutServiceReporterUniformDetectiveskirt - category: JobsServiceUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService - - !type:CharacterJobRequirement - jobs: - - Reporter - items: - - ClothingUniformJumpskirtDetective - -# Chef -- type: loadout - id: LoadoutServiceJumpsuitChefNt - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefUniforms - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingUniformJumpsuitChefNt - -- type: loadout - id: LoadoutServiceJumpsuitChefIdris - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefUniforms - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingUniformJumpsuitChefIdris - -- type: loadout - id: LoadoutServiceJumpsuitChefOrion - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefUniforms - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingUniformJumpsuitChefOrion - -- type: loadout - id: LoadoutServiceHeadChefNt - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefHead - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingHeadHatChefNt - -- type: loadout - id: LoadoutServiceHeadChefIdris - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefHead - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingHeadHatChefIdris - -- type: loadout - id: LoadoutServiceHeadChefOrion - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefHead - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingHeadHatChefOrion - -- type: loadout - id: LoadoutServiceOuterChefNt - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefOuter - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingOuterJacketChefNt - -- type: loadout - id: LoadoutServiceOuterChefIdris - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefOuter - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingOuterJacketChefIdris - -- type: loadout - id: LoadoutServiceOuterChefOrion - category: JobsServiceChef - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutChefOuter - - !type:CharacterJobRequirement - jobs: - - Chef - items: - - ClothingOuterJacketChefOrion - -# Janitor -- type: loadout - id: LoadoutServiceJumpsuitJanitorNt - category: JobsServiceJanitor - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutJanitorUniforms - - !type:CharacterJobRequirement - jobs: - - Janitor - items: - - ClothingUniformJumpsuitJanitorNt - -- type: loadout - id: LoadoutServiceJumpsuitJanitorIdris - category: JobsServiceJanitor - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutJanitorUniforms - - !type:CharacterJobRequirement - jobs: - - Janitor - items: - - ClothingUniformJumpsuitJanitorIdris - -- type: loadout - id: LoadoutServiceJumpsuitJanitorOrion - category: JobsServiceJanitor - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutJanitorUniforms - - !type:CharacterJobRequirement - jobs: - - Janitor - items: - - ClothingUniformJumpsuitJanitorOrion diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index 5106f1129c4..06300de1437 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -3,7 +3,7 @@ name: job-name-senior-engineer description: job-description-senior-engineer playTimeTracker: JobSeniorEngineer - setPreference: false # DeltaV - Disable Senior Roles round start selection + setPreference: true requirements: - !type:CharacterPlaytimeRequirement tracker: JobAtmosphericTechnician From 0d32b319e245b3e4f34f08b98ad05f9653f8a803 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 12:04:17 -0500 Subject: [PATCH 02/27] AAAAAAAAAAAAAAAAAAA --- .../Loadouts/Categories/categories.yml | 195 ++- .../Prototypes/Loadouts/Generic/backpacks.yml | 126 -- .../Loadouts/Generic/duffelbags.yml | 14 - .../Prototypes/Loadouts/Generic/satchels.yml | 28 - .../Loadouts/Jobs/Command/captain.yml | 140 ++- .../Loadouts/Jobs/Command/headOfPersonnel.yml | 83 +- .../Loadouts/Jobs/Command/uncategorized.yml | 49 +- .../Engineering/atmosphericTechnician.yml | 2 + .../Jobs/Engineering/chiefEngineer.yml | 2 + .../Jobs/Engineering/seniorEngineer.yml | 2 + .../Jobs/Engineering/stationEngineer.yml | 2 + .../Jobs/Engineering/technicalAssistant.yml | 2 + .../Jobs/Engineering/uncategorized.yml | 24 +- .../Loadouts/Jobs/Epistemics/acolyte.yml | 26 + .../Loadouts/Jobs/Epistemics/cataloger.yml | 43 +- .../Loadouts/Jobs/Epistemics/chaplain.yml | 24 + .../Loadouts/Jobs/Epistemics/golemancer.yml | 24 + .../Loadouts/Jobs/Epistemics/mystagogue.yml | 27 + .../Loadouts/Jobs/Epistemics/mystic.yml | 24 + .../Loadouts/Jobs/Epistemics/noviciate.yml | 26 + .../Jobs/Epistemics/psionicMantis.yml | 25 +- .../Jobs/Epistemics/uncategorized.yml | 126 +- .../Jobs/Logistics/cargoTechnician.yml | 22 +- .../Loadouts/Jobs/Logistics/courier.yml | 26 + .../Jobs/Logistics/logisticsOfficer.yml | 38 +- .../Jobs/Logistics/salvageSpecialist.yml | 59 +- .../Loadouts/Jobs/Logistics/uncategorized.yml | 39 + .../Loadouts/Jobs/Medical/chemist.yml | 39 + .../Jobs/Medical/chiefMedicalOfficer.yml | 27 + .../Loadouts/Jobs/Medical/medicalDoctor.yml | 26 + .../Loadouts/Jobs/Medical/medicalIntern.yml | 26 + .../Loadouts/Jobs/Medical/paramedic.yml | 26 + .../Loadouts/Jobs/Medical/seniorPhysician.yml | 71 ++ .../Loadouts/Jobs/Medical/uncategorized.yml | 176 +-- .../Loadouts/Jobs/Security/cadet.yml | 26 + .../Loadouts/Jobs/Security/corpsman.yml | 105 ++ .../Loadouts/Jobs/Security/detective.yml | 53 + .../Loadouts/Jobs/Security/headOfSecurity.yml | 226 ++-- .../Jobs/Security/securityOfficer.yml | 26 + .../Loadouts/Jobs/Security/seniorOfficer.yml | 77 ++ .../Loadouts/Jobs/Security/uncategorized.yml | 1064 ++++++----------- .../Loadouts/Jobs/Security/warden.yml | 107 ++ .../Loadouts/Jobs/Service/bartender.yml | 115 +- .../Loadouts/Jobs/Service/botanist.yml | 24 + .../Prototypes/Loadouts/Jobs/Service/chef.yml | 24 + .../Loadouts/Jobs/Service/clown.yml | 25 + .../Loadouts/Jobs/Service/janitor.yml | 25 + .../Loadouts/Jobs/Service/lawyer.yml | 25 + .../Prototypes/Loadouts/Jobs/Service/mime.yml | 25 + .../Loadouts/Jobs/Service/musician.yml | 25 + .../Loadouts/Jobs/Service/reporter.yml | 24 + .../Loadouts/Jobs/Service/uncategorized.yml | 29 +- .../Jobs/Engineering/senior_engineer.yml | 1 - 53 files changed, 2340 insertions(+), 1275 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/detective.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml index bfda095b193..74cf349f0d7 100644 --- a/Resources/Prototypes/Loadouts/Categories/categories.yml +++ b/Resources/Prototypes/Loadouts/Categories/categories.yml @@ -31,47 +31,214 @@ root: true subCategories: - JobsAUncategorized - - JobsCargo - JobsCommand - JobsEngineering + - JobsEpistemics + - JobsLogistics - JobsMedical - - JobsScience - JobsSecurity - JobsService - type: loadoutCategory id: JobsAUncategorized +# Command +# Only Captain and HoP, Department Specific roles are under their respective Departments. +# If we ever added Centcomm or Blueshield, that would go here. - type: loadoutCategory - id: JobsCargo + id: JobsCommand + subCategories: + - JobsCommandAUncategorized + - JobsCommandCaptain + - JobsCommandHeadOfPersonnel - type: loadoutCategory - id: JobsCommand + id: JobsCommandAUncategorized + +- type: loadoutCategory + id: JobsCommandCaptain + +- type: loadoutCategory + id: JobsCommandHeadOfPersonnel +# Engineering - type: loadoutCategory id: JobsEngineering + subCategories: + - JobsEngineeringAAUncategorized + - JobsEngineeringAtmosphericTechnician + - JobsEngineeringChiefEngineer + - JobsEngineeringSeniorEngineer + - JobsEngineeringStationEngineer + - JobsEngineeringTechnicalAssistant + +- type: loadoutCategory + id: JobsEngineeringAAUncategorized + +- type: loadoutCategory + id: JobsEngineeringAtmosphericTechnician + +- type: loadoutCategory + id: JobsEngineeringChiefEngineer + +- type: loadoutCategory + id: JobsEngineeringSeniorEngineer + +- type: loadoutCategory + id: JobsEngineeringStationEngineer + +- type: loadoutCategory + id: JobsEngineeringTechnicalAssistant + +# Epistemics +- type: loadoutCategory + id: JobsEpistemics + subCategories: + - JobsEpistemicsAAUncategorized + - JobsEpistemicsAcolyte + - JobsEpistemicsCataloger + - JobsEpistemicsChaplain + - JobsEpistemicsGolemancer + - JobsEpistemicsMystagogue + - JobsEpistemicsMystic + - JobsEpistemicsNoviciate + - JobsEpistemicsPsionicMantis + +- type: loadoutCategory + id: JobsEpistemicsAAUncategorized + +- type: loadoutCategory + id: JobsEpistemicsAcolyte + +- type: loadoutCategory + id: JobsEpistemicsCataloger + +- type: loadoutCategory + id: JobsEpistemicsChaplain + +- type: loadoutCategory + id: JobsEpistemicsGolemancer + +- type: loadoutCategory + id: JobsEpistemicsMystagogue + +- type: loadoutCategory + id: JobsEpistemicsMystic + +- type: loadoutCategory + id: JobsEpistemicsNoviciate + +- type: loadoutCategory + id: JobsEpistemicsPsionicMantis + +# Logistics +- type: loadoutCategory + id: JobsLogistics + subCategories: + - JobsLogisticsAUncategorized + - JobsLogisticsCargoTechnician + - JobsLogisticsCourier + - JobsLogisticsLogisticsOfficer + - JobsLogisticsSalvageSpecialist + +- type: loadoutCategory + id: JobsLogisticsAUncategorized +- type: loadoutCategory + id: JobsLogisticsCargoTechnician + +- type: loadoutCategory + id: JobsLogisticsCourier + +- type: loadoutCategory + id: JobsLogisticsLogisticsOfficer + +- type: loadoutCategory + id: JobsLogisticsSalvageSpecialist + +# Medical - type: loadoutCategory id: JobsMedical + subCategories: + - JobsMedicalAUncategorized + - JobsMedicalChemist + - JobsMedicalChiefMedicalOfficer + - JobsMedicalMedicalDoctor + - JobsMedicalMedicalIntern + - JobsMedicalParamedic + - JobsMedicalSeniorPhysician - type: loadoutCategory - id: JobsScience + id: JobsMedicalAUncategorized +- type: loadoutCategory + id: JobsMedicalChemist + +- type: loadoutCategory + id: JobsMedicalChiefMedicalOfficer + +- type: loadoutCategory + id: JobsMedicalMedicalDoctor + +- type: loadoutCategory + id: JobsMedicalMedicalIntern + +- type: loadoutCategory + id: JobsMedicalParamedic + +- type: loadoutCategory + id: JobsMedicalSeniorPhysician + +# Security - type: loadoutCategory id: JobsSecurity + subCategories: + - JobsSecurityAUncategorized + - JobsSecurityCadet + - JobsSecurityCorpsman + - JobsSecurityHeadOfSecurity + - JobsSecuritySecurityOfficer + - JobsSecuritySeniorOfficer + - JobsSecurityWarden +- type: loadoutCategory + id: JobsSecurityAUncategorized + +- type: loadoutCategory + id: JobsSecurityCadet + +- type: loadoutCategory + id: JobsSecurityCorpsman + +- type: loadoutCategory + id: JobsSecurityHeadOfSecurity + +- type: loadoutCategory + id: JobsSecuritySecurityOfficer + +- type: loadoutCategory + id: JobsSecuritySeniorOfficer + +- type: loadoutCategory + id: JobsSecurityWarden + +# Service - type: loadoutCategory id: JobsService subCategories: - - JobsServiceUncategorized + - JobsServiceAUncategorized - JobsServiceBartender - JobsServiceBotanist - JobsServiceChef + - JobsServiceClown - JobsServiceJanitor + - JobsServiceLawyer + - JobsServiceMime - JobsServiceMusician + - JobsServiceReporter - type: loadoutCategory - id: JobsServiceUncategorized + id: JobsServiceAUncategorized - type: loadoutCategory id: JobsServiceBartender @@ -82,12 +249,26 @@ - type: loadoutCategory id: JobsServiceChef +- type: loadoutCategory + id: JobsServiceClown + - type: loadoutCategory id: JobsServiceJanitor +- type: loadoutCategory + id: JobsServiceLawyer + +- type: loadoutCategory + id: JobsServiceMime + - type: loadoutCategory id: JobsServiceMusician +- type: loadoutCategory + id: JobsServiceReporter + +# Now Leaving: Jobs Category + - type: loadoutCategory id: Mask root: true diff --git a/Resources/Prototypes/Loadouts/Generic/backpacks.yml b/Resources/Prototypes/Loadouts/Generic/backpacks.yml index d2aa38467ca..e4dde18bd79 100644 --- a/Resources/Prototypes/Loadouts/Generic/backpacks.yml +++ b/Resources/Prototypes/Loadouts/Generic/backpacks.yml @@ -37,62 +37,6 @@ jobs: - HeadOfPersonnel -- type: loadout - id: LoadoutBackpackSecurity - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSecurity - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Security - -- type: loadout - id: LoadoutBackpackBrigmedic - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackBrigmedic - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Brigmedic - -- type: loadout - id: LoadoutBackpackMedical - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackMedical - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - -- type: loadout - id: LoadoutBackpackCaptain - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackCaptain - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Captain - - type: loadout id: LoadoutBackpackMime category: Backpacks @@ -107,20 +51,6 @@ jobs: - Mime -- type: loadout - id: LoadoutBackpackChemistry - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackChemistry - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackHydroponics category: Backpacks @@ -163,62 +93,6 @@ departments: - Epistemics -- type: loadout - id: LoadoutBackpackVirology - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackVirology - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - -- type: loadout - id: LoadoutBackpackGenetics - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackGenetics - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - -- type: loadout - id: LoadoutBackpackCargo - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackCargo - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Logistics - -- type: loadout - id: LoadoutBackpackSalvage - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSalvage - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Logistics - - type: loadout id: LoadoutBackpackMerc category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml index 9513ad60600..b3850389fd6 100644 --- a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml @@ -65,20 +65,6 @@ departments: - Medical -- type: loadout - id: LoadoutBackpackDuffelCaptain - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelCaptain - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Captain - - type: loadout id: LoadoutBackpackDuffelMime category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Generic/satchels.yml b/Resources/Prototypes/Loadouts/Generic/satchels.yml index 90fce4cf1ac..4d2f94a0966 100644 --- a/Resources/Prototypes/Loadouts/Generic/satchels.yml +++ b/Resources/Prototypes/Loadouts/Generic/satchels.yml @@ -64,34 +64,6 @@ jobs: - Brigmedic -- type: loadout - id: LoadoutBackpackSatchelMedical - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelMedical - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - -- type: loadout - id: LoadoutBackpackSatchelCaptain - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelCaptain - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Captain - - type: loadout id: LoadoutBackpackSatchelMime category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 47e4310fdf9..0158047dd22 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -1,121 +1,154 @@ +# Captain +# Backpacks - type: loadout - id: LoadoutCommandCapNeckMantle - category: JobsCommand + id: LoadoutBackpackCaptain + category: JobsCommandCaptain cost: 0 exclusive: true + items: + - ClothingBackpackCaptain requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks - !type:CharacterJobRequirement jobs: - Captain - items: - - ClothingNeckMantleCap - type: loadout - id: LoadoutCommandCapNeckCloak - category: JobsCommand + id: LoadoutBackpackSatchelCaptain + category: JobsCommandCaptain cost: 0 exclusive: true + items: + - ClothingBackpackSatchelCaptain requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks - !type:CharacterJobRequirement jobs: - Captain - items: - - ClothingNeckCloakCap - type: loadout - id: LoadoutCommandCapNeckCloakFormal - category: JobsCommand + id: LoadoutBackpackDuffelCaptain + category: JobsCommandCaptain cost: 0 exclusive: true + items: + - ClothingBackpackDuffelCaptain + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - Captain + +# Belt + +# Ears + +# Equipment +- type: loadout + id: LoadoutCommandCapItemDrinkFlask + category: JobsCommandCaptain + cost: 0 requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingNeckCloakCapFormal + - DrinkFlask +# Eyes + +# Gloves - type: loadout - id: LoadoutCommandCapJumpsuitFormal - category: JobsCommand + id: LoadoutCommandCapGloves + category: JobsCommandCaptain cost: 0 - exclusive: true requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingUniformJumpsuitCapFormal + - ClothingHandsGlovesCaptain +# Head - type: loadout - id: LoadoutCommandCapJumpskirtFormal - category: JobsCommand + id: LoadoutCommandCapHat + category: JobsCommandCaptain cost: 0 - exclusive: true requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingUniformJumpskirtCapFormalDress + - ClothingHeadHatCaptain - type: loadout - id: LoadoutCommandCapOuterWinter - category: JobsCommand - cost: 1 + id: LoadoutCommandCapHatCapcap + category: JobsCommandCaptain + cost: 0 requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingOuterWinterCap + - ClothingHeadHatCapcap - type: loadout - id: LoadoutCommandCapGloves - category: JobsCommand + id: LoadoutCommandCapHatBeret + category: JobsCommandCaptain cost: 0 requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingHandsGlovesCaptain + - ClothingHeadHatBeretCap +# Id + +# Neck - type: loadout - id: LoadoutCommandCapHat - category: JobsCommand + id: LoadoutCommandCapNeckMantle + category: JobsCommandCaptain cost: 0 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingHeadHatCaptain + - ClothingNeckMantleCap - type: loadout - id: LoadoutCommandCapHatCapcap + id: LoadoutCommandCapNeckCloak category: JobsCommand cost: 0 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingHeadHatCapcap + - ClothingNeckCloakCap - type: loadout - id: LoadoutCommandCapHatBeret - category: JobsCommand + id: LoadoutCommandCapNeckCloakFormal + category: JobsCommandCaptain cost: 0 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - ClothingHeadHatBeretCap + - ClothingNeckCloakCapFormal +# Mask - type: loadout id: LoadoutCommandCapMaskGas - category: JobsCommand + category: JobsCommandCaptain cost: 0 requirements: - !type:CharacterJobRequirement @@ -124,9 +157,22 @@ items: - ClothingMaskGasCaptain +# Outer +- type: loadout + id: LoadoutCommandCapOuterWinter + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingOuterWinterCap + +# Shoes - type: loadout id: LoadoutCommandCapShoesBootsWinter - category: JobsCommand + category: JobsCommandCaptain cost: 0 exclusive: true requirements: @@ -136,13 +182,27 @@ items: - ClothingShoesBootsWinterCap +# Uniforms - type: loadout - id: LoadoutCommandCapItemDrinkFlask - category: JobsCommand - cost: 1 + id: LoadoutCommandCapJumpsuitFormal + category: JobsCommandCaptain + cost: 0 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - Captain items: - - DrinkFlask + - ClothingUniformJumpsuitCapFormal + +- type: loadout + id: LoadoutCommandCapJumpskirtFormal + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingUniformJumpskirtCapFormalDress diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index 7bb265dd7b1..0cb7fdf4aeb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -1,30 +1,44 @@ +# Head Of Personnel +# Backpacks - type: loadout - id: LoadoutCommandHOPNeckMantle - category: JobsCommand + id: LoadoutCommandHOPBackIan + category: JobsCommandHeadOfPersonnel cost: 0 - exclusive: true requirements: - !type:CharacterJobRequirement jobs: - HeadOfPersonnel items: - - ClothingNeckMantleHOP + - ClothingBackpackIan + +# Belt +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head - type: loadout - id: LoadoutCommandHOPNeckCloak - category: JobsCommand + id: LoadoutCommandHOPHatCap + category: JobsCommandHeadOfPersonnel cost: 0 - exclusive: true requirements: - !type:CharacterJobRequirement jobs: - HeadOfPersonnel items: - - ClothingNeckCloakHop + - ClothingHeadHatHopcap +# Id + +# Neck - type: loadout - id: LoadoutCommandHOPJumpsuitTurtleneckBoatswain - category: JobsCommand + id: LoadoutCommandHOPNeckMantle + category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: @@ -32,11 +46,11 @@ jobs: - HeadOfPersonnel items: - - ClothingUniformJumpsuitBoatswain + - ClothingNeckMantleHOP - type: loadout - id: LoadoutCommandHOPJumpsuitMess - category: JobsCommand + id: LoadoutCommandHOPNeckCloak + category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: @@ -44,11 +58,11 @@ jobs: - HeadOfPersonnel items: - - ClothingUniformJumpsuitHoPMess + - ClothingNeckCloakHop - type: loadout - id: LoadoutCommandHOPJumpskirtMess - category: JobsCommand + id: LoadoutCommandHOPBedsheetIan + category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: @@ -56,11 +70,14 @@ jobs: - HeadOfPersonnel items: - - ClothingUniformJumpskirtHoPMess + - BedsheetIan + +# Mask +# Outer - type: loadout id: LoadoutcommandHOPOuterCoatFormal - category: JobsCommand + category: JobsCommandHeadOfPersonnel cost: 0 requirements: - !type:CharacterJobRequirement @@ -69,31 +86,35 @@ items: - ClothingOuterCoatHoPFormal +# Shoes - type: loadout - id: LoadoutCommandHOPBackIan - category: JobsCommand - cost: 2 + id: LoadoutCommandHOPShoesBootsWinter + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - HeadOfPersonnel items: - - ClothingBackpackIan + - ClothingShoesBootsWinterHeadOfPersonel +# Uniforms - type: loadout - id: LoadoutCommandHOPHatCap - category: JobsCommand + id: LoadoutCommandHOPJumpsuitTurtleneckBoatswain + category: JobsCommandHeadOfPersonnel cost: 0 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - HeadOfPersonnel items: - - ClothingHeadHatHopcap + - ClothingUniformJumpsuitBoatswain - type: loadout - id: LoadoutCommandHOPShoesBootsWinter - category: JobsCommand + id: LoadoutCommandHOPJumpsuitMess + category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: @@ -101,11 +122,11 @@ jobs: - HeadOfPersonnel items: - - ClothingShoesBootsWinterHeadOfPersonel + - ClothingUniformJumpsuitHoPMess - type: loadout - id: LoadoutCommandHOPBedsheetIan - category: JobsCommand + id: LoadoutCommandHOPJumpskirtMess + category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: @@ -113,4 +134,4 @@ jobs: - HeadOfPersonnel items: - - BedsheetIan + - ClothingUniformJumpskirtHoPMess diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml index a06972189c9..d2cadf8e970 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml @@ -1,6 +1,29 @@ +# Uncategorized +# Backpacks + +# Belt + +# Ears + +# Equipment +- type: loadout + id: LoadoutCommandTelescopicBaton + category: JobsCommandAUncategorized + cost: 3 + exclusive: true + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Command + items: + - TelescopicBaton + +# Eyes + +# Gloves - type: loadout id: LoadoutCommandGlovesInspection - category: JobsCommand + category: JobsCommandAUncategorized cost: 0 exclusive: true requirements: @@ -11,14 +34,16 @@ items: - ClothingHandsGlovesInspection -- type: loadout - id: LoadoutCommandTelescopicBaton - category: JobsCommand - cost: 3 - exclusive: true - requirements: - - !type:CharacterDepartmentRequirement - departments: - - Command - items: - - TelescopicBaton +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml index dd0591b17cf..7d3b4db56cb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml @@ -50,6 +50,8 @@ # Eyes +# Gloves + # Head # Id diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml index 40399216b50..c4e227af260 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml @@ -50,6 +50,8 @@ # Eyes +# Gloves + # Head # Id diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml index fa5ef1b6f2f..510c7703375 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -49,6 +49,8 @@ # Eyes +# Gloves + # Head # Id diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml index ab17802c81e..0c8c205a4ec 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml @@ -50,6 +50,8 @@ # Eyes +# Gloves + # Head # Id diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml index 34280d436e9..21133494ddf 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml @@ -9,6 +9,8 @@ # Eyes +# Gloves + # Head # Id diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml index 9403eb15f7b..d77515f8455 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml @@ -2,7 +2,7 @@ # Backpacks - type: loadout id: LoadoutBackpackEngineering - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true items: @@ -16,7 +16,7 @@ - type: loadout id: LoadoutBackpackSatchelEngineering - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true items: @@ -30,7 +30,7 @@ - type: loadout id: LoadoutBackpackDuffelEngineering - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true items: @@ -50,7 +50,7 @@ # Eyes - type: loadout id: LoadoutEngineeringEyesMeson - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: @@ -62,10 +62,12 @@ items: - ClothingEyesGlassesMeson +# Gloves + # Head - type: loadout id: LoadoutEngineeringHeadBeret - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: @@ -79,7 +81,7 @@ - type: loadout id: LoadoutEngineeringHeadHardhatBlue - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: @@ -93,7 +95,7 @@ - type: loadout id: LoadoutEngineeringHeadHardhatOrange - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: @@ -107,7 +109,7 @@ - type: loadout id: LoadoutEngineeringHeadHardhatYellow - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: @@ -121,7 +123,7 @@ - type: loadout id: LoadoutEngineeringHeadHardhatWhite - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: @@ -135,7 +137,7 @@ - type: loadout id: LoadoutEngineeringHeadHardhatRed - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: @@ -156,7 +158,7 @@ # Outer - type: loadout id: LoadoutEngineeringOuterHazard - category: JobsEngineeringAUncategorized + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml index e69de29bb2d..d0c82c617e6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/acolyte.yml @@ -0,0 +1,26 @@ +# Acolyte +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml index 6385e3e9504..ba986472827 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml @@ -1,7 +1,32 @@ # Cataloger +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms - type: loadout id: LoadoutScienceJumpsuitLibrarianNt - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -15,7 +40,7 @@ - type: loadout id: LoadoutScienceJumpsuitLibrarianIdris - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -29,7 +54,7 @@ - type: loadout id: LoadoutScienceJumpsuitLibrarianOrion - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -43,7 +68,7 @@ - type: loadout id: LoadoutScienceJumpsuitLibrarianHeph - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -57,7 +82,7 @@ - type: loadout id: LoadoutScienceJumpsuitLibrarianPMCG - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -71,7 +96,7 @@ - type: loadout id: LoadoutScienceJumpsuitLibrarianZav - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -85,7 +110,7 @@ - type: loadout id: LoadoutScienceJumpsuitLibrarianZeng - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -99,7 +124,7 @@ - type: loadout id: LoadoutScienceJumpsuitLibrarian - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: @@ -113,7 +138,7 @@ - type: loadout id: LoadoutScienceJumpskirtLibrarian - category: JobsScience + category: JobsEpistemicsCataloger cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml index 4f29e4393f5..461919aaf83 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml @@ -1,4 +1,28 @@ # Chaplain +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + # Uniforms - type: loadout id: LoadoutChaplainJumpsuit diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml index 8e381cd9c71..0209bec59ff 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml @@ -1,4 +1,28 @@ # Golemancer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + # Uniforms - type: loadout id: LoadoutScienceUniformJumpskirtRoboticist diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml index fcd6ce1dd5c..1bfa043654f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml @@ -1,3 +1,30 @@ +# Mystagogue +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms + # Outer - type: loadout id: LoadoutCommandRDOuterWinter diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml index 63579495acb..fcae1ff5e73 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml @@ -1,4 +1,28 @@ # Mystic +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + # Uniforms - type: loadout id: LoadoutScienceUniformJumpskirtSenior diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml index e69de29bb2d..429a82bf9fe 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/noviciate.yml @@ -0,0 +1,26 @@ +# Noviciate +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml index f4e44d4542a..fcf558095f8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml @@ -1,5 +1,23 @@ # Psionic Mantis -# Uniforms +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask # Outer - type: loadout @@ -15,3 +33,8 @@ - ForensicMantis items: - ClothingOuterWinterCoatMantis + + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml index 4df077b232d..4c687e38034 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -1,117 +1,129 @@ # Uniforms -# Outer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes - type: loadout - id: LoadoutScienceOuterCoat + id: LoadoutScienceEyesHudDiagnostic category: JobsScience - cost: 0 + cost: 1 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEyesScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingOuterCoatRnd + - ClothingEyesHudDiagnostic - type: loadout - id: LoadoutScienceOuterLabcoat + id: LoadoutScienceEyesEyepatchHudDiag category: JobsScience - cost: 0 + cost: 1 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEyesScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingOuterCoatLab + - ClothingEyesEyepatchHudDiag +# Gloves - type: loadout - id: LoadoutSciencegOuterCoatRobo + id: LoadoutScienceHandsGlovesColorPurple category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutGlovesScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingOuterCoatRobo + - ClothingHandsGlovesColorPurple - type: loadout - id: LoadoutScienceOuterWinterSci + id: LoadoutScienceHandsGlovesLatex category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutGlovesScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingOuterWinterSci + - ClothingHandsGlovesLatex - type: loadout - id: LoadoutScienceOuterExplorerLabcoat + id: LoadoutScienceHandsGlovesRobohands category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutGlovesScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingOuterExplorerCoat + - ClothingHandsGlovesRobohands -# Gloves +# Head - type: loadout - id: LoadoutScienceHandsGlovesColorPurple + id: LoadoutScienceHeadHatBeret category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience + group: LoadoutHeadScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingHandsGlovesColorPurple + - ClothingHeadHatBeretRND - type: loadout - id: LoadoutScienceHandsGlovesLatex + id: LoadoutScienceHeadHatFez category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience + group: LoadoutHeadScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingHandsGlovesLatex + - ClothingHeadHatFez - type: loadout - id: LoadoutScienceHandsGlovesRobohands - category: JobsScience + id: LoadoutHeadHoodTechPriest + category: Head cost: 0 exclusive: true + items: + - ClothingHeadTechPriest requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience + group: LoadoutHeadScience - !type:CharacterDepartmentRequirement departments: - Epistemics - items: - - ClothingHandsGlovesRobohands + + +# Id # Neck - type: loadout @@ -156,80 +168,79 @@ items: - ClothingNeckScarfStripedBlack -# Head +# Mask + +# Outer - type: loadout - id: LoadoutScienceHeadHatBeret + id: LoadoutScienceOuterCoat category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutOuterScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingHeadHatBeretRND + - ClothingOuterCoatRnd - type: loadout - id: LoadoutScienceHeadHatFez + id: LoadoutScienceOuterLabcoat category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutOuterScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingHeadHatFez + - ClothingOuterCoatLab -# Eyes - type: loadout - id: LoadoutScienceEyesHudDiagnostic + id: LoadoutSciencegOuterCoatRobo category: JobsScience - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesScience + group: LoadoutOuterScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingEyesHudDiagnostic + - ClothingOuterCoatRobo - type: loadout - id: LoadoutScienceEyesEyepatchHudDiag + id: LoadoutScienceOuterWinterSci category: JobsScience - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesScience + group: LoadoutOuterScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingEyesEyepatchHudDiag + - ClothingOuterWinterSci -# Shoes - type: loadout - id: LoadoutScienceShoesBootsWinterSci + id: LoadoutScienceOuterExplorerLabcoat category: JobsScience cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesScience + group: LoadoutOuterScience - !type:CharacterDepartmentRequirement departments: - Epistemics items: - - ClothingShoesBootsWinterSci + - ClothingOuterExplorerCoat -# Robes - type: loadout id: LoadoutOuterRobeTechPriest category: Outer @@ -243,16 +254,19 @@ departments: - Epistemics +# Shoes - type: loadout - id: LoadoutHeadHoodTechPriest - category: Head + id: LoadoutScienceShoesBootsWinterSci + category: JobsScience cost: 0 exclusive: true - items: - - ClothingHeadTechPriest requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutShoesScience - !type:CharacterDepartmentRequirement departments: - Epistemics + items: + - ClothingShoesBootsWinterSci + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml index 77ec83a522c..39a3dd28aa2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml @@ -1,5 +1,23 @@ # Cargo technician -# Uniforms +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask # Outer - type: loadout @@ -30,3 +48,5 @@ - CargoTechnician items: - ClothingShoesBootsWinterCargo + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/courier.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/courier.yml index e69de29bb2d..3c0651c7698 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/courier.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/courier.yml @@ -0,0 +1,26 @@ +# Courier +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml index 0dd45eb3f5f..440aef4eea1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml @@ -1,15 +1,29 @@ -# What? This isn't a thing?? :( -# - type: loadout -# id: LoadoutCommandQMNeckMantle -# category: JobsCommand -# cost: 2 -# exclusive: true -# requirements: -# - !type:CharacterJobRequirement -# jobs: -# - Quartermaster -# items: -# - ClothingNeckMantleQM +# Logistics Officer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms - type: loadout id: LoadoutCommandQMNeckCloak diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index fe8e7e00487..631e1f051a5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -1,25 +1,47 @@ # Salvage Specialist -# Uniforms - -# Outer +# Backpacks - type: loadout - id: LoadoutCargoOuterWinterMiner - category: JobsCargo - cost: 1 + id: LoadoutBackpackSalvage + category: JobsLogisticsSalvageSpecialist + cost: 0 exclusive: true + items: + - ClothingBackpackSalvage requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterCargo + group: LoadoutBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Logistics + +# Belt + +# Ears + +# Equipment +- type: loadout + id: LoadoutCargoWeaponsCrusherDagger + category: JobsLogisticsSalvageSpecialist + cost: 2 + requirements: - !type:CharacterJobRequirement jobs: - SalvageSpecialist items: - - ClothingOuterWinterMiner + - WeaponCrusherDagger + +# Eyes + +# Gloves + +# Head + +# Id # Neck - type: loadout id: LoadoutCargoNeckGoliathCloak - category: JobsCargo + category: JobsLogisticsSalvageSpecialist cost: 0 exclusive: true requirements: @@ -34,14 +56,23 @@ items: - ClothingNeckCloakGoliathCloak -# Weapons +# Mask + +# Outer - type: loadout - id: LoadoutCargoWeaponsCrusherDagger - category: JobsCargo - cost: 2 + id: LoadoutCargoOuterWinterMiner + category: JobsLogisticsSalvageSpecialist + cost: 1 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterCargo - !type:CharacterJobRequirement jobs: - SalvageSpecialist items: - - WeaponCrusherDagger + - ClothingOuterWinterMiner + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml index e69de29bb2d..95208865714 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml @@ -0,0 +1,39 @@ +# Uncategorized +# Backpacks +- type: loadout + id: LoadoutBackpackCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackCargo + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Logistics + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index e69de29bb2d..49191f2f453 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -0,0 +1,39 @@ +# Chemist +# Backpacks +- type: loadout + id: LoadoutBackpackChemistry + category: JobsMedicalChemist + cost: 0 + exclusive: true + items: + - ClothingBackpackChemistry + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - Chemist + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml index 0c46af70137..98e8c23622f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml @@ -1,3 +1,30 @@ +# Chief Medical Officer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms + - type: loadout id: LoadoutCommandCMONeckMantle category: JobsCommand diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml index e69de29bb2d..ff4d81d3467 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml @@ -0,0 +1,26 @@ +# Medical Doctor +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml index e69de29bb2d..05234ca1ead 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml @@ -0,0 +1,26 @@ +# Medical Intern +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index e69de29bb2d..12d12a4a718 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -0,0 +1,26 @@ +# Paramedic +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml new file mode 100644 index 00000000000..c68f5d5c7db --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml @@ -0,0 +1,71 @@ +# Senior Physician +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms +- type: loadout + id: LoadoutMedicalUniformJumpskirtSenior + category: JobsMedicalSeniorPhysician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsMedical + - !type:CharacterJobRequirement + jobs: + - SeniorPhysician + - !type:CharacterPlaytimeRequirement + tracker: JobChemist + min: 21600 # 6 hours + - !type:CharacterPlaytimeRequirement + tracker: JobMedicalDoctor + min: 21600 # 6 hours + - !type:CharacterDepartmentTimeRequirement + department: Medical + min: 216000 # 60 hours + items: + - ClothingUniformJumpskirtSeniorPhysician + +- type: loadout + id: LoadoutMedicalUniformJumpsuitSenior + category: JobsMedicalSeniorPhysician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsMedical + - !type:CharacterJobRequirement + jobs: + - SeniorPhysician + - !type:CharacterPlaytimeRequirement + tracker: JobChemist + min: 21600 # 6 hours + - !type:CharacterPlaytimeRequirement + tracker: JobMedicalDoctor + min: 21600 # 6 hours + - !type:CharacterDepartmentTimeRequirement + department: Medical + min: 216000 # 60 hours + items: + - ClothingUniformJumpsuitSeniorPhysician diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml index 6a2d5fb9d2e..11851ccad62 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml @@ -1,3 +1,70 @@ +# Uncategorized +# Backpacks +- type: loadout + id: LoadoutBackpackMedical + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackMedical + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical + +- type: loadout + id: LoadoutBackpackVirology + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackVirology + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical + +- type: loadout + id: LoadoutBackpackGenetics + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackGenetics + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical + +- type: loadout + id: LoadoutBackpackSatchelMedical + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelMedical + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves - type: loadout id: LoadoutMedicalGlovesNitrile category: JobsMedical @@ -6,16 +73,36 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutGlovesMedical + - !type:CharacterDepartmentRequirement + departments: + - Medical + items: + - ClothingHandsGlovesNitrile + +# Head + +# Id + +# Neck +- type: loadout + id: LoadoutMedicalNeckStethoscope + category: JobsMedical + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckMedical - !type:CharacterJobRequirement jobs: - MedicalDoctor - - Paramedic - ChiefMedicalOfficer - MedicalIntern - - Chemist items: - - ClothingHandsGlovesNitrile + - ClothingNeckStethoscope + +# Mask +# Outer - type: loadout id: LoadoutMedicalOuterLabcoat category: JobsMedical @@ -32,21 +119,24 @@ - ClothingOuterCoatLab - type: loadout - id: LoadoutMedicalNeckStethoscope + id: LoadoutMedicalOuterCybersunWindbreaker category: JobsMedical - cost: 0 + cost: 3 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckMedical + group: LoadoutOuterMedical - !type:CharacterJobRequirement jobs: - MedicalDoctor - - ChiefMedicalOfficer - - MedicalIntern + - Chemist + - Paramedic items: - - ClothingNeckStethoscope + - ClothingOuterCoatCybersunWindbreaker + +# Shoes +# Uniforms - type: loadout id: LoadoutMedicalUniformScrubsBlue category: JobsMedical @@ -165,22 +255,6 @@ items: - UniformScrubsColorCybersun -- type: loadout - id: LoadoutMedicalOuterCybersunWindbreaker - category: JobsMedical - cost: 3 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - items: - - ClothingOuterCoatCybersunWindbreaker - - type: loadout id: LoadoutMedicalOuterLabcoatChem category: JobsMedical @@ -234,58 +308,6 @@ items: - ClothingUniformJumpskirtParamedic -- type: loadout - id: LoadoutMedicalUniformJumpskirtSenior - category: JobsMedical - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - ChiefMedicalOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours - items: - - ClothingUniformJumpskirtSeniorPhysician - -- type: loadout - id: LoadoutMedicalUniformJumpsuitSenior - category: JobsMedical - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - ChiefMedicalOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours - items: - - ClothingUniformJumpsuitSeniorPhysician - - type: loadout id: LoadoutMedicalHeadNurse category: JobsMedical diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/cadet.yml b/Resources/Prototypes/Loadouts/Jobs/Security/cadet.yml index e69de29bb2d..5450f362cf9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/cadet.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/cadet.yml @@ -0,0 +1,26 @@ +# Cadet +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml new file mode 100644 index 00000000000..5ac0c9e21f5 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml @@ -0,0 +1,105 @@ +# Corpsman +# Backpacks +- type: loadout + id: LoadoutBackpackCorpsman + category: JobsSecurityCorpsman + cost: 0 + exclusive: true + items: + - ClothingBackpackBrigmedic + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - Brigmedic + +# Belt +- type: loadout + id: LoadoutClothingBeltCorpsmanWebbing + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBeltSecurity + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - ClothingBeltCorpsmanWebbingFilled + +# Ears + +# Equipment + +# Eyes + +# Gloves +- type: loadout + id: LoadoutClothingHandsGlovesNitrile + category: JobsSecurityCorpsman + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutGlovesSecurity + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - ClothingHandsGlovesNitrile + +# Head +- type: loadout + id: LoadoutClothingHeadHatBeretBrigmedic + category: JobsSecurityCorpsman + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadSecurity + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - ClothingHeadHatBeretBrigmedic + +- type: loadout + id: LoadoutClothingHeadHatBeretCorpsman + category: JobsSecurityCorpsman + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadSecurity + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - ClothingHeadHatBeretCorpsman + +# Id + +# Neck +- type: loadout + id: LoadoutBedsheetBrigmedic + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeckSecurity + - !type:CharacterJobRequirement + jobs: + - Brigmedic + items: + - BedsheetBrigmedic + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml new file mode 100644 index 00000000000..f072d8b1193 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -0,0 +1,53 @@ +# Detective +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer +- type: loadout + id: LoadoutClothingOuterCoatDetective + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterSecurity + - !type:CharacterJobRequirement + jobs: + - Detective + items: + - ClothingOuterCoatDetective + +- type: loadout + id: LoadoutOuterVestDetective + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterSecurity + - !type:CharacterJobRequirement + jobs: + - Detective + items: + - ClothingOuterVestDetective + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml index bd2a03f214f..6e6fefe3576 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml @@ -1,102 +1,137 @@ +# Head Of Security +# Backpacks + +# Belt + +# Ears + +# Equipment +# Head of Security Weapon Selection +# Most of these mirror the unique weapons that were previously map-specific items placed in the HoS Office. +# Or are weapons that fit a similar theme of "Rare weapons not normally seen by Security" - type: loadout - id: LoadoutCommandHOSNeckMantle - category: JobsCommand + id: LoadoutCommandHoSPulsePistol + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingNeckMantleHOS + - WeaponPulsePistolHoS - type: loadout - id: LoadoutCommandHOSNeckCloak - category: JobsCommand + id: LoadoutCommandHoSWt550 + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingNeckCloakHos + - WeaponSubMachineGunWt550HoS - type: loadout - id: LoadoutCommandHOSJumpsuitAlt - category: JobsCommand + id: LoadoutCommandHoSKatanaSheath + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingUniformJumpsuitHoSAlt + - ClothingBeltKatanaSheathFilledHoS - type: loadout - id: LoadoutCommandHOSJumpsuitBlue - category: JobsCommand + id: LoadoutCommandHoSC20r + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingUniformJumpsuitHoSBlue + - WeaponSubMachineGunC20rHoS - type: loadout - id: LoadoutCommandHOSJumpsuitGrey - category: JobsCommand + id: LoadoutCommandHoSBulldog + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingUniformJumpsuitHoSGrey + - WeaponShotgunBulldogHoS - type: loadout - id: LoadoutCommandHOSJumpsuitParade - category: JobsCommand + id: LoadoutCommandHoSEnergySword + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingUniformJumpsuitHoSParadeMale + - EnergySwordHoS - type: loadout - id: LoadoutCommandHOSJumpsuitFormal - category: JobsCommand + id: LoadoutCommandHoSEnergyGun + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingUniformJumpsuitHosFormal + - WeaponEnergyGunMultiphase +# Eyes + +# Gloves + +# Head - type: loadout - id: LoadoutCommandHOSJumpskirtAlt - category: JobsCommand + id: LoadoutCommandHOSHatBeret + category: JobsSecurityHeadOfSecurity cost: 0 - exclusive: true requirements: - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingUniformJumpskirtHoSAlt + - ClothingHeadHatBeretHoS - type: loadout - id: LoadoutCommandHOSJumpskirtParade - category: JobsCommand + id: LoadoutCommandHOSHatHoshat + category: JobsSecurityHeadOfSecurity + cost: 0 + requirements: + - !type:CharacterJobRequirement + jobs: + - HeadOfSecurity + items: + - ClothingHeadHatHoshat +# Id + +# Neck +- type: loadout + id: LoadoutCommandHOSNeckMantle + category: JobsSecurityHeadOfSecurity cost: 0 exclusive: true requirements: @@ -104,11 +139,11 @@ jobs: - HeadOfSecurity items: - - ClothingUniformJumpskirtHoSParadeMale + - ClothingNeckMantleHOS - type: loadout - id: LoadoutCommandHOSJumpskirtFormal - category: JobsCommand + id: LoadoutCommandHOSNeckCloak + category: JobsSecurityHeadOfSecurity cost: 0 exclusive: true requirements: @@ -116,12 +151,15 @@ jobs: - HeadOfSecurity items: - - ClothingUniformJumpskirtHosFormal + - ClothingNeckCloakHos + +# Mask +# Outer - type: loadout id: LoadoutCommandHOSOuterWinter - category: JobsCommand - cost: 1 + category: JobsSecurityHeadOfSecurity + cost: 0 requirements: - !type:CharacterJobRequirement jobs: @@ -131,8 +169,8 @@ - type: loadout id: LoadoutCommandHOSOuterTrench - category: JobsCommand - cost: 1 + category: JobsSecurityHeadOfSecurity + cost: 0 requirements: - !type:CharacterJobRequirement jobs: @@ -140,130 +178,140 @@ items: - ClothingOuterCoatHoSTrench +# Shoes - type: loadout - id: LoadoutCommandHOSHatBeret - category: JobsCommand + id: LoadoutCommandHOSShoesBootsWinter + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingHeadHatBeretHoS + - ClothingShoesBootsWinterHeadOfSecurity +# Uniforms - type: loadout - id: LoadoutCommandHOSHatHoshat - category: JobsCommand + id: LoadoutUniformJumpskirtHoSBlue + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsSecurity - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingHeadHatHoshat + - ClothingUniformJumpskirtHoSBlue - type: loadout - id: LoadoutCommandHOSShoesBootsWinter - category: JobsCommand + id: LoadoutUniformJumpskirtHoSGrey + category: JobsSecurityHeadOfSecurity cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsSecurity - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingShoesBootsWinterHeadOfSecurity + - ClothingUniformJumpskirtHoSGrey -# Head of Security Weapon Selection -# Most of these mirror the unique weapons that were previously map-specific items placed in the HoS Office. -# Or are weapons that fit a similar theme of "Rare weapons not normally seen by Security" - type: loadout - id: LoadoutCommandHoSPulsePistol - category: JobsCommand + id: LoadoutCommandHOSJumpsuitAlt + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - WeaponPulsePistolHoS + - ClothingUniformJumpsuitHoSAlt - type: loadout - id: LoadoutCommandHoSWt550 - category: JobsCommand + id: LoadoutCommandHOSJumpsuitBlue + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - WeaponSubMachineGunWt550HoS + - ClothingUniformJumpsuitHoSBlue - type: loadout - id: LoadoutCommandHoSKatanaSheath - category: JobsCommand + id: LoadoutCommandHOSJumpsuitGrey + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - ClothingBeltKatanaSheathFilledHoS + - ClothingUniformJumpsuitHoSGrey - type: loadout - id: LoadoutCommandHoSC20r - category: JobsCommand + id: LoadoutCommandHOSJumpsuitParade + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - WeaponSubMachineGunC20rHoS + - ClothingUniformJumpsuitHoSParadeMale - type: loadout - id: LoadoutCommandHoSBulldog - category: JobsCommand + id: LoadoutCommandHOSJumpsuitFormal + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - WeaponShotgunBulldogHoS + - ClothingUniformJumpsuitHosFormal - type: loadout - id: LoadoutCommandHoSEnergySword - category: JobsCommand + id: LoadoutCommandHOSJumpskirtAlt + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - EnergySwordHoS + - ClothingUniformJumpskirtHoSAlt - type: loadout - id: LoadoutCommandHoSEnergyGun - category: JobsCommand + id: LoadoutCommandHOSJumpskirtParade + category: JobsSecurityHeadOfSecurity cost: 0 + exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity items: - - WeaponEnergyGunMultiphase + - ClothingUniformJumpskirtHoSParadeMale + +- type: loadout + id: LoadoutCommandHOSJumpskirtFormal + category: JobsSecurityHeadOfSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - HeadOfSecurity + items: + - ClothingUniformJumpskirtHosFormal diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/securityOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/securityOfficer.yml index e69de29bb2d..36ce1874aa9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/securityOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/securityOfficer.yml @@ -0,0 +1,26 @@ +# Security Officer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml new file mode 100644 index 00000000000..fa9f7c3aa20 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml @@ -0,0 +1,77 @@ +# Senior Officer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms +- type: loadout + id: LoadoutSecurityUniformJumpskirtSenior + category: JobsSecuritySeniorOfficer + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorOfficerUniforms + - !type:CharacterJobRequirement + jobs: + - SeniorOfficer + - !type:CharacterPlaytimeRequirement + tracker: JobWarden + min: 21600 # 6 hours + - !type:CharacterPlaytimeRequirement + tracker: JobDetective + min: 7200 # 2 hours + - !type:CharacterPlaytimeRequirement + tracker: JobSecurityOfficer + min: 21600 # 6 hours + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 216000 # 60 hours + items: + - ClothingUniformJumpskirtSeniorOfficer + +- type: loadout + id: LoadoutSecurityUniformJumpsuitSenior + category: JobsSecuritySeniorOfficer + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorOfficerUniforms + - !type:CharacterJobRequirement + jobs: + - SeniorOfficer + - !type:CharacterPlaytimeRequirement + tracker: JobWarden + min: 21600 # 6 hours + - !type:CharacterPlaytimeRequirement + tracker: JobDetective + min: 7200 # 2 hours + - !type:CharacterPlaytimeRequirement + tracker: JobSecurityOfficer + min: 21600 # 6 hours + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 216000 # 60 hours + items: + - ClothingUniformJumpsuitSeniorOfficer diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index f2587b4d14d..ba04c749996 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -1,951 +1,631 @@ -# Uniforms +# Uncategorized +# Backpack - type: loadout - id: LoadoutSecurityUniformJumpsuitBlue + id: LoadoutClothingBackSecurity category: JobsSecurity cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutBackSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingUniformJumpsuitSecBlue + - ClothingBackpackSecurity - type: loadout - id: LoadoutSecurityUniformJumpsuitGrey + id: LoadoutClothingBackSecuritySatchel category: JobsSecurity cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutBackSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingUniformJumpsuitSecGrey + - ClothingBackpackSatchelSecurity - type: loadout - id: LoadoutSecurityUniformJumpskirtGrey + id: LoadoutClothingBackSecurityDuffel category: JobsSecurity cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutBackSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingUniformJumpskirtSecGrey + - ClothingBackpackDuffelSecurity +# Belt - type: loadout - id: LoadoutSecurityUniformJumpskirtBlue + id: LoadoutSecurityBeltWebbing category: JobsSecurity cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutBeltSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingUniformJumpskirtSecBlue + - ClothingBeltSecurityWebbingFilled - type: loadout - id: LoadoutSecurityUniformJumpskirtSenior + id: LoadoutClothingBeltSecurity category: JobsSecurity - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 7200 # 2 hours - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 216000 # 60 hours + group: LoadoutBeltSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpskirtSeniorOfficer + - ClothingBeltSecurityFilled - type: loadout - id: LoadoutSecurityUniformJumpsuitSenior + id: LoadoutClothingBeltHolster category: JobsSecurity - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 7200 # 2 hours - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 216000 # 60 hours + group: LoadoutBeltSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpsuitSeniorOfficer + - ClothingBeltHolster +# Ears + +# Equipment +# Equipment, limit 3 selections +# Duplicate "Spare" equipment exists and shares the ItemGroup, for those officers who like to pack a spare magazine in their pocket, outside of what was issued to them. +# I knew a lot of people in my time working IRL Armed security that did this. - type: loadout - id: LoadoutUniformJumpsuitWardenBlue + id: LoadoutSecurityCombatKnife category: JobsSecurity cost: 0 - exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - Warden + group: LoadoutEquipmentSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpsuitWardenBlue + - CombatKnife - type: loadout - id: LoadoutUniformJumpsuitWardenGrey + id: LoadoutSecurityFlash category: JobsSecurity cost: 0 - exclusive: true requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - Warden + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpsuitWardenGrey + - Flash - type: loadout - id: LoadoutUniformJumpskirtWardenBlue + id: LoadoutMagazinePistol category: JobsSecurity cost: 0 - exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - Warden + group: LoadoutEquipmentSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpskirtWardenBlue + - MagazinePistol - type: loadout - id: LoadoutUniformJumpskirtWardenGrey + id: LoadoutMagazinePistolSpare category: JobsSecurity - cost: 0 - exclusive: true + cost: 2 requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - Warden + group: LoadoutEquipmentSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpskirtWardenGrey + - MagazinePistol - type: loadout - id: LoadoutUniformJumpskirtHoSBlue + id: LoadoutMagazinePistolRubber category: JobsSecurity cost: 0 - exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity + group: LoadoutEquipmentSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpskirtHoSBlue + - MagazinePistolRubber - type: loadout - id: LoadoutUniformJumpskirtHoSGrey + id: LoadoutMagazinePistolRubberSpare category: JobsSecurity - cost: 0 - exclusive: true + cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity + group: LoadoutEquipmentSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingUniformJumpskirtHoSGrey + - MagazinePistolRubber - type: loadout - id: LoadoutUniformJumpsuitSecFormal + id: LoadoutSpeedLoaderMagnum category: JobsSecurity cost: 0 exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutEquipmentSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingUniformJumpsuitSecFormal + - SpeedLoaderMagnum - type: loadout - id: LoadoutUniformJumpsuitSecSummer + id: LoadoutSpeedLoaderMagnumSpare category: JobsSecurity - cost: 0 + cost: 2 exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutEquipmentSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingUniformJumpsuitSecSummer + - SpeedLoaderMagnum -# Mask - type: loadout - id: LoadoutSecurityMaskGasSwat + id: LoadoutSpeedLoaderMagnumRubber category: JobsSecurity cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskSecurity - - !type:CharacterJobRequirement - jobs: - - Warden - - HeadOfSecurity + group: LoadoutEquipmentSecurity + - !type:CharacterDepartmentRequirement + departments: + - Security items: - - ClothingMaskGasSwat + - SpeedLoaderMagnumRubber -# Shoes - type: loadout - id: LoadoutSecurityShoesJackboots + id: LoadoutSpeedLoaderMagnumRubberSpare category: JobsSecurity - cost: 0 + cost: 2 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesSecurity + group: LoadoutEquipmentSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingShoesBootsJack + - SpeedLoaderMagnumRubber - type: loadout - id: LoadoutClothingShoesBootsCombat + id: LoadoutMagazineMagnum category: JobsSecurity - cost: 0 + cost: 2 exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutShoesSecurity + group: LoadoutEquipmentSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingShoesBootsCombatFilled + - MagazineMagnum -# Eyes - type: loadout - id: LoadoutSecurityEyesHudSecurity + id: LoadoutMagazineMagnumRubber category: JobsSecurity - cost: 0 + cost: 2 exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutEquipmentSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingEyesHudSecurity + - MagazineMagnumRubber - type: loadout - id: ClothingEyesGlassesSunglasses + id: LoadoutMagazineMagnumSpare category: JobsSecurity - cost: 0 + cost: 2 exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutEquipmentSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingEyesGlassesSunglasses + - MagazineMagnum - type: loadout - id: LoadoutSecurityEyesEyepatchHudSecurity + id: LoadoutMagazineMagnumRubberSpare category: JobsSecurity - cost: 0 + cost: 2 exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutEquipmentSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingEyesEyepatchHudSecurity + - MagazineMagnumRubber +# Service Weapon, limit 1 selection. +# Security no longer spawns with a weapon automatically, instead they have a free choice of security appropriate Duty Pistol in their loadouts. +# This category is universal to the entire security department by special request, so that players can choose their preferred Duty Pistol even if they aren't playing a security role. +# All lethal options come with a 1 hour security department playtime, as a basic shitter protection. - type: loadout - id: LoadoutSecurityEyesHudSecurityPrescription + id: LoadoutSecurityDisabler category: JobsSecurity cost: 0 - exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security - - !type:CharacterTraitRequirement - traits: - - Nearsighted items: - - ClothingEyesPrescriptionHudSecurity + - WeaponDisabler - type: loadout - id: LoadoutClothingEyesGlassesSecurity + id: LoadoutSecurityMk58 category: JobsSecurity - cost: 2 - exclusive: true + cost: 0 requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingEyesGlassesSecurity + - WeaponPistolMk58Security -#Backpack - type: loadout - id: LoadoutClothingBackSecurity + id: LoadoutSecurityMk58NonLethal category: JobsSecurity cost: 0 - exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingBackpackSecurity + - WeaponPistolMk58SecurityNonlethal - type: loadout - id: LoadoutClothingBackSecuritySatchel + id: LoadoutSecurityRevolver category: JobsSecurity cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - ClothingBackpackSatchelSecurity - -- type: loadout - id: LoadoutClothingBackSecurityDuffel - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - ClothingBackpackDuffelSecurity - -# Head -- type: loadout - id: LoadoutSecurityHeadHatBeret - category: JobsSecurity - cost: 0 - exclusive: true requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingHeadHatBeretSecurity + - WeaponRevolverInspectorSecurity - type: loadout - id: LoadoutClothingHeadHelmetBasic + id: LoadoutSecurityRevolverNonLethal category: JobsSecurity cost: 0 - exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingHeadHelmetBasic - -- type: loadout - id: LoadoutClothingHeadHatBeretBrigmedic - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity - - !type:CharacterJobRequirement - jobs: - - Brigmedic - items: - - ClothingHeadHatBeretBrigmedic - -- type: loadout - id: LoadoutClothingHeadHatBeretCorpsman - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity - - !type:CharacterJobRequirement - jobs: - - Brigmedic - items: - - ClothingHeadHatBeretCorpsman - -- type: loadout - id: LoadoutClothingHeadHatBeretWarden - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity - - !type:CharacterJobRequirement - jobs: - - Warden - items: - - ClothingHeadHatBeretWarden - -- type: loadout - id: LoadoutClothingHeadHatBeretHoS - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - ClothingHeadHatBeretHoS + - WeaponRevolverInspectorNonLethalSecurity - type: loadout - id: LoadoutSecurityHeadHelmetInsulated + id: LoadoutSecurityRevolverDeckard category: JobsSecurity cost: 1 requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - ClothingHeadHelmetInsulated - -# Belt -- type: loadout - id: LoadoutSecurityBeltWebbing - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - ClothingBeltSecurityWebbingFilled - -- type: loadout - id: LoadoutClothingBeltCorpsmanWebbing - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity - - !type:CharacterJobRequirement - jobs: - - Brigmedic - items: - - ClothingBeltCorpsmanWebbingFilled - -- type: loadout - id: LoadoutClothingBeltSecurity - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingBeltSecurityFilled + - WeaponRevolverDeckardSecurity - type: loadout - id: LoadoutClothingBeltHolster + id: LoadoutSecurityRevolverDeckardNonLethal category: JobsSecurity - cost: 0 - exclusive: true + cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingBeltHolster - -#Gloves - -- type: loadout - id: LoadoutClothingHandsGlovesNitrile - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGlovesSecurity - - !type:CharacterJobRequirement - jobs: - - Brigmedic - items: - - ClothingHandsGlovesNitrile - -# Outerwear + - WeaponRevolverDeckardNonLethalSecurity - type: loadout - id: LoadoutClothingOuterArmorPlateCarrier + id: LoadoutSecurityPistolN1984 category: JobsSecurity - cost: 0 - exclusive: true + cost: 2 requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingOuterArmorPlateCarrier + - WeaponPistolN1984Security - type: loadout - id: LoadoutClothingOuterArmorDuraVest + id: LoadoutSecurityPistolN1984NonLethal category: JobsSecurity - cost: 0 - exclusive: true + cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingOuterArmorDuraVest + - WeaponPistolN1984SecurityNonLethal - type: loadout - id: LoadoutClothingOuterArmorBasic + id: LoadoutSecurityPistolViper category: JobsSecurity - cost: 0 - exclusive: true + cost: 2 requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingOuterArmorBasic + - WeaponPistolViperSecurity - type: loadout - id: LoadoutClothingOuterArmorSlim + id: LoadoutSecurityPistolViperNonLethal category: JobsSecurity - cost: 0 - exclusive: true + cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - ClothingOuterArmorBasicSlim - -- type: loadout - id: LoadoutClothingOuterCoatDetective - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity - - !type:CharacterJobRequirement - jobs: - - Detective - items: - - ClothingOuterCoatDetective - -- type: loadout - id: LoadoutOuterVestDetective - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity - - !type:CharacterJobRequirement - jobs: - - Detective - items: - - ClothingOuterVestDetective - -- type: loadout - id: LoadoutClothingOuterCoatWarden - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity - - !type:CharacterJobRequirement - jobs: - - Warden - items: - - ClothingOuterCoatWarden - -- type: loadout - id: LoadoutClothingOuterCoatHoSTrench - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - ClothingOuterCoatHoSTrench - -- type: loadout - id: LoadoutClothingOuterWinterHoS - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - ClothingOuterWinterHoS - -# Neck -- type: loadout - id: LoadoutClothingNeckCloakHos - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckSecurity - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - ClothingNeckCloakHos - -- type: loadout - id: LoadoutClothingNeckMantleHOS - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckSecurity - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - ClothingNeckMantleHOS - -- type: loadout - id: LoadoutBedsheetBrigmedic - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeckSecurity - - !type:CharacterJobRequirement - jobs: - - Brigmedic - items: - - BedsheetBrigmedic + - WeaponPistolViperSecurityNonLethal -# Equipment, limit 3 selections -# Duplicate "Spare" equipment exists and shares the ItemGroup, for those officers who like to pack a spare magazine in their pocket, outside of what was issued to them. -# I knew a lot of people in my time working IRL Armed security that did this. - type: loadout - id: LoadoutSecurityCombatKnife + id: LoadoutSecurityPistolViperWood category: JobsSecurity - cost: 0 + cost: 2 requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 108000 # 30 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - CombatKnife - -- type: loadout - id: LoadoutSecurityFlash - category: JobsSecurity - cost: 0 - requirements: + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - Flash + - WeaponPistolViperWoodSecurity - type: loadout - id: LoadoutMagazinePistol + id: LoadoutSecurityEquipmentTruncheon category: JobsSecurity - cost: 0 + cost: 3 requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security + - !type:CharacterSpeciesRequirement + species: + - Oni items: - - MagazinePistol + - Truncheon - type: loadout - id: LoadoutMagazinePistolSpare + id: LoadoutSecurityPistolSvalin category: JobsSecurity - cost: 2 + cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - MagazinePistol - -- type: loadout - id: LoadoutMagazinePistolRubber - category: JobsSecurity - cost: 0 - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - MagazinePistolRubber + - WeaponLaserSvalinn - type: loadout - id: LoadoutMagazinePistolRubberSpare + id: LoadoutSecurityEnergyGunMini category: JobsSecurity cost: 2 - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - MagazinePistolRubber - -- type: loadout - id: LoadoutSpeedLoaderMagnum - category: JobsSecurity - cost: 0 - exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - SpeedLoaderMagnum + - WeaponEnergyGunMiniSecurity - type: loadout - id: LoadoutSpeedLoaderMagnumSpare + id: LoadoutSecurityEnergyGunPistol category: JobsSecurity cost: 2 - exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - items: - - SpeedLoaderMagnum - -- type: loadout - id: LoadoutSpeedLoaderMagnumRubber - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - SpeedLoaderMagnumRubber + - WeaponEnergyGunPistolSecurity - type: loadout - id: LoadoutSpeedLoaderMagnumRubberSpare + id: LoadoutSecurityPistolPollock category: JobsSecurity - cost: 2 - exclusive: true + cost: 1 requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - SpeedLoaderMagnumRubber + - WeaponPistolPollockSecurity - type: loadout - id: LoadoutMagazineMagnum + id: LoadoutSecurityPistolPollockNonlethal category: JobsSecurity - cost: 2 - exclusive: true + cost: 1 requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - MagazineMagnum + - WeaponPistolPollockNonlethalSecurity - type: loadout - id: LoadoutMagazineMagnumRubber + id: LoadoutSecurityRevolverSnub category: JobsSecurity cost: 2 - exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - MagazineMagnumRubber + - WeaponRevolverSnubSecurity - type: loadout - id: LoadoutMagazineMagnumSpare + id: LoadoutSecurityRevolverSnubNonlethal category: JobsSecurity cost: 2 - exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - MagazineMagnum + - WeaponRevolverSnubNonlethalSecurity - type: loadout - id: LoadoutMagazineMagnumRubberSpare + id: LoadoutSecurityRevolverK38Master category: JobsSecurity - cost: 2 - exclusive: true + cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutWeaponSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - MagazineMagnumRubber + - WeaponRevolverK38MasterSecurity -# Service Weapon, limit 1 selection. -# Security no longer spawns with a weapon automatically, instead they have a free choice of security appropriate Duty Pistol in their loadouts. -# This category is universal to the entire security department by special request, so that players can choose their preferred Duty Pistol even if they aren't playing a security role. -# All lethal options come with a 1 hour security department playtime, as a basic shitter protection. - type: loadout - id: LoadoutSecurityDisabler + id: LoadoutSecurityRevolverK38MasterNonlethal category: JobsSecurity - cost: 0 + cost: 1 requirements: - !type:CharacterItemGroupRequirement group: LoadoutWeaponSecurity @@ -953,12 +633,12 @@ departments: - Security items: - - WeaponDisabler + - WeaponRevolverK38MasterNonlethalSecurity - type: loadout - id: LoadoutSecurityMk58 + id: LoadoutSecurityRevolverFitz category: JobsSecurity - cost: 0 + cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -969,12 +649,12 @@ departments: - Security items: - - WeaponPistolMk58Security + - WeaponRevolverFitzSecurity - type: loadout - id: LoadoutSecurityMk58NonLethal + id: LoadoutSecurityRevolverFitzNonlethal category: JobsSecurity - cost: 0 + cost: 1 requirements: - !type:CharacterItemGroupRequirement group: LoadoutWeaponSecurity @@ -982,12 +662,12 @@ departments: - Security items: - - WeaponPistolMk58SecurityNonlethal + - WeaponRevolverFitzNonlethalSecurity - type: loadout - id: LoadoutSecurityRevolver + id: LoadoutSecurityRevolverPython category: JobsSecurity - cost: 0 + cost: 3 requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -998,12 +678,12 @@ departments: - Security items: - - WeaponRevolverInspectorSecurity + - WeaponRevolverPythonSecurity - type: loadout - id: LoadoutSecurityRevolverNonLethal + id: LoadoutSecurityRevolverPythonNonlethal category: JobsSecurity - cost: 0 + cost: 3 requirements: - !type:CharacterItemGroupRequirement group: LoadoutWeaponSecurity @@ -1011,319 +691,313 @@ departments: - Security items: - - WeaponRevolverInspectorNonLethalSecurity + - WeaponRevolverPythonNonlethalSecurity +# Eyes - type: loadout - id: LoadoutSecurityRevolverDeckard + id: LoadoutSecurityEyesHudSecurity category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutEyesSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverDeckardSecurity + - ClothingEyesHudSecurity - type: loadout - id: LoadoutSecurityRevolverDeckardNonLethal + id: ClothingEyesGlassesSunglasses category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutEyesSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverDeckardNonLethalSecurity + - ClothingEyesGlassesSunglasses - type: loadout - id: LoadoutSecurityPistolN1984 + id: LoadoutSecurityEyesEyepatchHudSecurity category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutEyesSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponPistolN1984Security + - ClothingEyesEyepatchHudSecurity - type: loadout - id: LoadoutSecurityPistolN1984NonLethal + id: LoadoutSecurityEyesHudSecurityPrescription category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutEyesSecurity - !type:CharacterDepartmentRequirement departments: - Security + - !type:CharacterTraitRequirement + traits: + - Nearsighted items: - - WeaponPistolN1984SecurityNonLethal + - ClothingEyesPrescriptionHudSecurity - type: loadout - id: LoadoutSecurityPistolViper + id: LoadoutClothingEyesGlassesSecurity category: JobsSecurity cost: 2 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutEyesSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponPistolViperSecurity + - ClothingEyesGlassesSecurity + +# Gloves +# Head - type: loadout - id: LoadoutSecurityPistolViperNonLethal + id: LoadoutSecurityHeadHatBeret category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutHeadSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponPistolViperSecurityNonLethal + - ClothingHeadHatBeretSecurity - type: loadout - id: LoadoutSecurityPistolViperWood + id: LoadoutClothingHeadHelmetBasic category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 108000 # 30 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutHeadSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponPistolViperWoodSecurity + - ClothingHeadHelmetBasic - type: loadout - id: LoadoutSecurityEquipmentTruncheon + id: LoadoutSecurityHeadHelmetInsulated category: JobsSecurity - cost: 3 + cost: 1 requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutHeadSecurity - !type:CharacterDepartmentRequirement departments: - Security - - !type:CharacterSpeciesRequirement - species: - - Oni items: - - Truncheon + - ClothingHeadHelmetInsulated + +# Id + +# Neck +# Mask - type: loadout - id: LoadoutSecurityPistolSvalin + id: LoadoutSecurityMaskGasSwat category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security + group: LoadoutMaskSecurity + - !type:CharacterJobRequirement + jobs: + - Warden + - HeadOfSecurity items: - - WeaponLaserSvalinn + - ClothingMaskGasSwat +# Outer - type: loadout - id: LoadoutSecurityEnergyGunMini + id: LoadoutClothingOuterArmorPlateCarrier category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutOuterSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponEnergyGunMiniSecurity + - ClothingOuterArmorPlateCarrier - type: loadout - id: LoadoutSecurityEnergyGunPistol + id: LoadoutClothingOuterArmorDuraVest category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutOuterSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponEnergyGunPistolSecurity + - ClothingOuterArmorDuraVest - type: loadout - id: LoadoutSecurityPistolPollock + id: LoadoutClothingOuterArmorBasic category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutOuterSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponPistolPollockSecurity + - ClothingOuterArmorBasic - type: loadout - id: LoadoutSecurityPistolPollockNonlethal + id: LoadoutClothingOuterArmorSlim category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutOuterSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponPistolPollockNonlethalSecurity + - ClothingOuterArmorBasicSlim +# Shoes - type: loadout - id: LoadoutSecurityRevolverSnub + id: LoadoutSecurityShoesJackboots category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutShoesSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverSnubSecurity + - ClothingShoesBootsJack - type: loadout - id: LoadoutSecurityRevolverSnubNonlethal + id: LoadoutClothingShoesBootsCombat category: JobsSecurity - cost: 2 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutShoesSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverSnubNonlethalSecurity + - ClothingShoesBootsCombatFilled +# Uniforms - type: loadout - id: LoadoutSecurityRevolverK38Master + id: LoadoutSecurityUniformJumpsuitBlue category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutUniformsSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverK38MasterSecurity + - ClothingUniformJumpsuitSecBlue - type: loadout - id: LoadoutSecurityRevolverK38MasterNonlethal + id: LoadoutSecurityUniformJumpsuitGrey category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutUniformsSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverK38MasterNonlethalSecurity + - ClothingUniformJumpsuitSecGrey - type: loadout - id: LoadoutSecurityRevolverFitz + id: LoadoutSecurityUniformJumpskirtGrey category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutUniformsSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverFitzSecurity + - ClothingUniformJumpskirtSecGrey - type: loadout - id: LoadoutSecurityRevolverFitzNonlethal + id: LoadoutSecurityUniformJumpskirtBlue category: JobsSecurity - cost: 1 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutUniformsSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverFitzNonlethalSecurity + - ClothingUniformJumpskirtSecBlue - type: loadout - id: LoadoutSecurityRevolverPython + id: LoadoutUniformJumpsuitSecFormal category: JobsSecurity - cost: 3 + cost: 0 + exclusive: true requirements: - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutUniformsSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverPythonSecurity + - ClothingUniformJumpsuitSecFormal - type: loadout - id: LoadoutSecurityRevolverPythonNonlethal + id: LoadoutUniformJumpsuitSecSummer category: JobsSecurity - cost: 3 + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutUniformsSecurity - !type:CharacterDepartmentRequirement departments: - Security items: - - WeaponRevolverPythonNonlethalSecurity + - ClothingUniformJumpsuitSecSummer diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index e69de29bb2d..969b1374e65 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -0,0 +1,107 @@ +# Warden +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head +- type: loadout + id: LoadoutClothingHeadHatBeretWarden + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadSecurity + - !type:CharacterJobRequirement + jobs: + - Warden + items: + - ClothingHeadHatBeretWarden + +# Id + +# Neck + +# Mask + +# Outer +- type: loadout + id: LoadoutClothingOuterCoatWarden + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuterSecurity + - !type:CharacterJobRequirement + jobs: + - Warden + items: + - ClothingOuterCoatWarden + +# Shoes + +# Uniforms +- type: loadout + id: LoadoutUniformJumpsuitWardenBlue + category: JobsSecurityWarden + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutWardenUniforms + - !type:CharacterJobRequirement + jobs: + - Warden + items: + - ClothingUniformJumpsuitWardenBlue + +- type: loadout + id: LoadoutUniformJumpsuitWardenGrey + category: JobsSecurityWarden + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutWardenUniforms + - !type:CharacterJobRequirement + jobs: + - Warden + items: + - ClothingUniformJumpsuitWardenGrey + +- type: loadout + id: LoadoutUniformJumpskirtWardenBlue + category: JobsSecurityWarden + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutWardenUniforms + - !type:CharacterJobRequirement + jobs: + - Warden + items: + - ClothingUniformJumpskirtWardenBlue + +- type: loadout + id: LoadoutUniformJumpskirtWardenGrey + category: JobsSecurityWarden + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutWardenUniforms + - !type:CharacterJobRequirement + jobs: + - Warden + items: + - ClothingUniformJumpskirtWardenGrey diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml index deb5125ea19..cde23eeaf38 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml @@ -1,106 +1,123 @@ # Bartender -# Uniforms +# Backpacks + +# Belt + +# Ears + +# Equipment - type: loadout - id: LoadoutServiceBartenderUniformPurple + id: LoadoutServiceBartenderBoxBeanbags category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutBartenderAmmo - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingUniformJumpsuitBartenderPurple + - BoxBeanbag - type: loadout - id: LoadoutServiceJumpsuitBartenderNt + id: LoadoutServiceBartenderBoxLightRifleRubber category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderUniforms + group: LoadoutBartenderAmmo - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingUniformJumpsuitBartenderNt + - MagazineBoxLightRifleRubber - type: loadout - id: LoadoutServiceJumpsuitBartenderIdris + id: LoadoutServiceBartenderShotgunDoubleBarreledRubber category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderUniforms + group: LoadoutBartenderWeapon - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingUniformJumpsuitBartenderIdris + - WeaponShotgunDoubleBarreledRubber - type: loadout - id: LoadoutServiceJumpsuitBartenderOrion + id: LoadoutServiceBartenderMosinRubber category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderUniforms + group: LoadoutBartenderWeapon - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingUniformJumpsuitBartenderOrion + - WeaponSniperMosinRubber -# Outer +# Eyes + +# Gloves + +# Head - type: loadout - id: LoadoutServiceBartenderArmorDuraVest + id: LoadoutServiceHeadBartenderNt category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear + group: LoadoutBartenderHead - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingOuterArmorDuraVest + - ClothingHeadHatFlatcapBartenderNanotrasen - type: loadout - id: LoadoutServiceOuterBartenderNt + id: LoadoutServiceHeadBartenderIdris category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear + group: LoadoutBartenderHead - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingOuterVestNt + - ClothingHeadHatFlatcapBartenderIdris - type: loadout - id: LoadoutServiceOuterBartenderIdris + id: LoadoutServiceHeadBartenderOrion category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear + group: LoadoutBartenderHead - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingOuterVestIdris + - ClothingHeadHatFlatcapBartenderOrion + +# Id + +# Neck +# Mask + +# Outer - type: loadout - id: LoadoutServiceOuterBartenderOrion + id: LoadoutServiceBartenderArmorDuraVest category: JobsServiceBartender cost: 0 exclusive: true @@ -111,105 +128,105 @@ jobs: - Bartender items: - - ClothingOuterVestOrion + - ClothingOuterArmorDuraVest -# Ammo - type: loadout - id: LoadoutServiceBartenderBoxBeanbags + id: LoadoutServiceOuterBartenderNt category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderAmmo + group: LoadoutBartenderOuterwear - !type:CharacterJobRequirement jobs: - Bartender items: - - BoxBeanbag + - ClothingOuterVestNt - type: loadout - id: LoadoutServiceBartenderBoxLightRifleRubber + id: LoadoutServiceOuterBartenderIdris category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderAmmo + group: LoadoutBartenderOuterwear - !type:CharacterJobRequirement jobs: - Bartender items: - - MagazineBoxLightRifleRubber + - ClothingOuterVestIdris -# Weapons - type: loadout - id: LoadoutServiceBartenderShotgunDoubleBarreledRubber + id: LoadoutServiceOuterBartenderOrion category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderWeapon + group: LoadoutBartenderOuterwear - !type:CharacterJobRequirement jobs: - Bartender items: - - WeaponShotgunDoubleBarreledRubber + - ClothingOuterVestOrion + +# Shoes +# Uniforms - type: loadout - id: LoadoutServiceBartenderMosinRubber + id: LoadoutServiceBartenderUniformPurple category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderWeapon + group: LoadoutUniformsService - !type:CharacterJobRequirement jobs: - Bartender items: - - WeaponSniperMosinRubber + - ClothingUniformJumpsuitBartenderPurple -# Head - type: loadout - id: LoadoutServiceHeadBartenderNt + id: LoadoutServiceJumpsuitBartenderNt category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderHead + group: LoadoutBartenderUniforms - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingHeadHatFlatcapBartenderNanotrasen + - ClothingUniformJumpsuitBartenderNt - type: loadout - id: LoadoutServiceHeadBartenderIdris + id: LoadoutServiceJumpsuitBartenderIdris category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderHead + group: LoadoutBartenderUniforms - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingHeadHatFlatcapBartenderIdris + - ClothingUniformJumpsuitBartenderIdris - type: loadout - id: LoadoutServiceHeadBartenderOrion + id: LoadoutServiceJumpsuitBartenderOrion category: JobsServiceBartender cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderHead + group: LoadoutBartenderUniforms - !type:CharacterJobRequirement jobs: - Bartender items: - - ClothingHeadHatFlatcapBartenderOrion + - ClothingUniformJumpsuitBartenderOrion diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml index 9d9af12ef3e..0559eac1e46 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml @@ -1,4 +1,28 @@ # Botanist +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + # Uniforms - type: loadout id: LoadoutServiceBotanistUniformOveralls diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml index 766e803d070..1d8c0753b02 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml @@ -1,4 +1,28 @@ # Chef +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + # Uniforms - type: loadout id: LoadoutServiceJumpsuitChefNt diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml index 632df35ae4a..dee98a2a95c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml @@ -1,4 +1,29 @@ # Clown +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms - type: loadout id: LoadoutServiceClownOutfitJester category: JobsServiceUncategorized diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml index 207e9034a75..b8a2909e209 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/janitor.yml @@ -1,4 +1,29 @@ # Janitor +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms - type: loadout id: LoadoutServiceJumpsuitJanitorNt category: JobsServiceJanitor diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml index 528e1f86c74..00de8101e0f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml @@ -1,4 +1,29 @@ # Lawyer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms - type: loadout id: LoadoutServiceLawyerUniformBlueSuit category: JobsServiceUncategorized diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml index 6b403813a38..ab2fe5bfa19 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml @@ -1,4 +1,29 @@ # Mime +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms - type: loadout id: LoadoutServiceMimeOuterWinter category: JobsServiceUncategorized diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml index 5bf5471697b..931f5fbc02c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml @@ -1,4 +1,11 @@ # Musician +# Backpacks + +# Belt + +# Ears + +# Equipment # Musician Instruments # Brass Instruments - type: loadout @@ -552,3 +559,21 @@ - Musician items: - BagpipeInstrument + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml index a7190e39aca..3d09480da52 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml @@ -1,4 +1,28 @@ # Reporter +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + # Uniforms - type: loadout id: LoadoutServiceReporterUniformDetectivesuit diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml index ebde55c37a9..fa94fd05655 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml @@ -1,9 +1,16 @@ +# Uncategorized +# Backpacks + +# Belt + +# Ears + +# Equipment # For the most part we dont want people to take this item, so its used as an example of all the things # you can do with requirements. Point someone to this thing if they ask "how tf do loadout requirements work?" - - type: loadout id: LoadoutServiceClownCowToolboxFilled - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 2 requirements: - !type:CharacterItemGroupRequirement @@ -45,3 +52,21 @@ - Clown items: - CowToolboxFilled + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index 06300de1437..128779db94d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -3,7 +3,6 @@ name: job-name-senior-engineer description: job-description-senior-engineer playTimeTracker: JobSeniorEngineer - setPreference: true requirements: - !type:CharacterPlaytimeRequirement tracker: JobAtmosphericTechnician From 24b82d884b48fbac37142ef39a20e422c50d2d61 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 13:24:08 -0500 Subject: [PATCH 03/27] Captain is done now --- Resources/Migrations/eeMigration.yml | 3 + .../Catalog/Fills/Lockers/heads.yml | 38 +-- .../Jobs/Command/captain.yml | 127 ++++++++ .../Jobs/Command/headOfPersonnel.yml | 0 .../Jobs/Command/uncategorized.yml | 0 .../CharacterItemGroups/backpackGroups.yml | 2 - .../Weapons/Guns/Battery/battery_guns.yml | 11 +- .../Loadouts/Jobs/Command/captain.yml | 280 +++++++++++++++++- .../Loadouts/Jobs/Command/headOfPersonnel.yml | 27 ++ .../Loadouts/Jobs/Command/uncategorized.yml | 28 +- .../Objectives/stealTargetGroups.yml | 4 +- Resources/Prototypes/Objectives/traitor.yml | 28 +- .../Prototypes/Roles/Jobs/Command/captain.yml | 4 - .../Roles/Jobs/Command/head_of_personnel.yml | 1 - 14 files changed, 485 insertions(+), 68 deletions(-) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml diff --git a/Resources/Migrations/eeMigration.yml b/Resources/Migrations/eeMigration.yml index 195c1f87651..459af36aa9e 100644 --- a/Resources/Migrations/eeMigration.yml +++ b/Resources/Migrations/eeMigration.yml @@ -117,3 +117,6 @@ MailPAI: MailNFPAI # 2024-08-27 Oracle: OracleSpawner SophicScribe: SophicScribeSpawner + +# 2024-11-16 +GlassBoxLaser: null #Captain's Laser was moved to Loadouts. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 5898468c344..d7d28bb1a13 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -32,55 +32,38 @@ components: - type: StorageFill contents: - - id: ClothingOuterArmorCaptainCarapace - id: NukeDisk - id: PinpointerNuclear -# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system + - id: CaptainIDCard - id: ClothingOuterHardsuitCap - - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - id: PlushieNuke prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - id: DoorRemoteCommand - id: RubberStampCaptain -# - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box - id: JetpackCaptainFilled - - id: MedalCase - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 - type: entity id: LockerCaptainFilled - suffix: Filled, AntiqueLaser + suffix: Filled, AntiqueLaser # Deprecated, Antique laser is now part of Captain's Loadouts. parent: LockerCaptain components: - type: StorageFill contents: - - id: ClothingOuterArmorCaptainCarapace - id: NukeDisk - id: PinpointerNuclear -# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system - - id: WeaponDisabler + - id: CaptainIDCard - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - id: PlushieNuke prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - id: DoorRemoteCommand - id: RubberStampCaptain - - id: WeaponAntiqueLaser - id: JetpackCaptainFilled - - id: MedalCase - - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! + - id: LunchboxCommandFilledRandom prob: 0.3 - type: entity @@ -90,25 +73,17 @@ components: - type: StorageFill contents: - - id: ClothingOuterArmorCaptainCarapace - id: NukeDisk - id: PinpointerNuclear -# - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat. - - id: WeaponDisabler + - id: CaptainIDCard - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - id: PlushieNuke prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - id: DoorRemoteCommand - id: RubberStampCaptain - id: JetpackCaptainFilled - - id: MedalCase - - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! + - id: LunchboxCommandFilledRandom prob: 0.3 - type: entity @@ -124,7 +99,6 @@ - id: BoxID - id: BoxHeadset - id: IDComputerCircuitboard - - id: WeaponDisabler - id: ClothingOuterCoatHoPArmored # DeltaV - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite - id: CigarGoldCase diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml new file mode 100644 index 00000000000..f1cfbf7f48a --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml @@ -0,0 +1,127 @@ +- type: characterItemGroup + id: LoadoutCaptainBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutBackpackCaptain + - type: loadout + id: LoadoutBackpackSatchelCaptain + - type: loadout + id: LoadoutBackpackDuffelCaptain + - type: loadout + id: LoadoutBackpackCaptainFilled + - type: loadout + id: LoadoutBackpackSatchelCaptainFilled + - type: loadout + id: LoadoutBackpackDuffelCaptainFilled + +- type: characterItemGroup + id: LoadoutCaptainBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutCaptainSwordSheath + +- type: characterItemGroup + id: LoadoutCaptainTrinkets + maxItems: 4 + items: + - type: loadout + id: LoadoutCaptainDrinkFlask + - type: loadout + id: LoadoutCaptainMedalCase + - type: loadout + id: LoadoutCaptainSpaceCash1000 + - type: loadout + id: LoadoutCaptainCigarCase + +- type: characterItemGroup + id: LoadoutCaptainWeapon + maxItems: 1 + items: + - type: loadout + id: LoadoutCaptainAntiqueLaserPistol + - type: loadout + id: LoadoutCaptainPulsePistol + +- type: characterItemGroup + id: LoadoutCaptainEyes + maxItems: 1 + items: + - type: loadout + id: LoadoutCaptainEyesSunglasses + +- type: characterItemGroup + id: LoadoutCaptainGloves + maxItems: 1 + items: + - type: loadout + id: LoadoutCaptainGlovesCapGloves + - type: loadout + id: LoadoutCaptainGlovesInspection + +- type: characterItemGroup + id: LoadoutCaptainHead + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCapHat + - type: loadout + id: LoadoutCommandCapHatCapcap + - type: loadout + id: LoadoutCommandCapHatBeret + +- type: characterItemGroup + id: LoadoutCaptainNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCapNeckMantle + - type: loadout + id: LoadoutCommandCapNeckCloak + - type: loadout + id: LoadoutCommandCapNeckCloakFormal + - type: loadout + id: LoadoutCaptainNeckGoldMedal + +- type: characterItemGroup + id: LoadoutCaptainMask + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCapMaskGas + +- type: characterItemGroup + id: LoadoutCaptainOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCapOuterWinter + - type: loadout + id: LoadoutCaptainOuterCarapace + +- type: characterItemGroup + id: LoadoutCaptainShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutCaptainShoesLaceup + - type: loadout + id: LoadoutCaptainShoesLeather + - type: loadout + id: LoadoutCaptainShoesWinter + - type: loadout + id: LoadoutCaptainShoesCombat + +- type: characterItemGroup + id: LoadoutCaptainUniform + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCapJumpsuit + - type: loadout + id: LoadoutCommandCapJumpskirt + - type: loadout + id: LoadoutCommandCapJumpsuitFormal + - type: loadout + id: LoadoutCommandCapJumpskirtFormal diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml b/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml index c12db85146d..8ccd4d0453a 100644 --- a/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml @@ -7,5 +7,3 @@ id: LoadoutBackpackDuffel - type: loadout id: LoadoutBackpackSatchel - - type: loadout - id: LoadoutBackpackClown diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 8f062a8620b..57db6326bcc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -277,6 +277,15 @@ - type: StealTarget stealGroup: HoSAntiqueWeapon +- type: entity + name: captain's pulse pistol + parent: WeaponPulsePistol + id: WeaponPulsePistolCaptain + description: A rare and exotic handgun gifted to the station's Captain. Its ivory grip has been engraved with the words, "Glory to the Company, Glory to Mother Sol. Phoron will make us all rich." + components: + - type: StealTarget + stealGroup: WeaponCaptain + - type: entity name: pulse carbine parent: [BaseWeaponBattery, BaseGunWieldable] @@ -595,7 +604,7 @@ - type: StaticPrice price: 750 - type: StealTarget - stealGroup: WeaponAntiqueLaser + stealGroup: WeaponCaptain - type: entity name: advanced laser pistol diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 0158047dd22..4a07efc8d27 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -9,7 +9,7 @@ - ClothingBackpackCaptain requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutCaptainBackpacks - !type:CharacterJobRequirement jobs: - Captain @@ -23,7 +23,7 @@ - ClothingBackpackSatchelCaptain requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutCaptainBackpacks - !type:CharacterJobRequirement jobs: - Captain @@ -37,47 +37,198 @@ - ClothingBackpackDuffelCaptain requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutCaptainBackpacks + - !type:CharacterJobRequirement + jobs: + - Captain + +- type: loadout + id: LoadoutBackpackCaptainFilled + category: JobsCommandCaptain + cost: 0 + exclusive: true + items: + - ClothingBackpackCaptainFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainBackpacks + - !type:CharacterJobRequirement + jobs: + - Captain + +- type: loadout + id: LoadoutBackpackSatchelCaptainFilled + category: JobsCommandCaptain + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelCaptainFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainBackpacks + - !type:CharacterJobRequirement + jobs: + - Captain + +- type: loadout + id: LoadoutBackpackDuffelCaptainFilled + category: JobsCommandCaptain + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelCaptainFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainBackpacks - !type:CharacterJobRequirement jobs: - Captain # Belt +- type: loadout + id: LoadoutCaptainSwordSheath + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainBelt + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingBeltSheathFilled # Ears # Equipment - type: loadout - id: LoadoutCommandCapItemDrinkFlask + id: LoadoutCaptainDrinkFlask category: JobsCommandCaptain cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainTrinkets - !type:CharacterJobRequirement jobs: - Captain items: - DrinkFlask +- type: loadout + id: LoadoutCaptainMedalCase + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainTrinkets + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - MedalCase + +- type: loadout + id: LoadoutCaptainSpaceCash1000 + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainTrinkets + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - SpaceCash1000 + +- type: loadout + id: LoadoutCaptainCigarCase + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainTrinkets + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - CigarGoldCase + +- type: loadout + id: LoadoutCaptainAntiqueLaserPistol + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainWeapon + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - WeaponAntiqueLaser + +- type: loadout + id: LoadoutCaptainPulsePistol + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainWeapon + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - WeaponPulsePistolCaptain + # Eyes +- type: loadout + id: LoadoutCaptainEyesSunglasses + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainEyes + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingEyesGlassesSunglasses # Gloves - type: loadout - id: LoadoutCommandCapGloves + id: LoadoutCaptainGlovesCapGloves category: JobsCommandCaptain cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainGloves - !type:CharacterJobRequirement jobs: - Captain items: - ClothingHandsGlovesCaptain +- type: loadout + id: LoadoutCaptainGlovesInspection + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainGloves + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingHandsGlovesInspection + # Head - type: loadout id: LoadoutCommandCapHat category: JobsCommandCaptain cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainHead - !type:CharacterJobRequirement jobs: - Captain @@ -89,6 +240,8 @@ category: JobsCommandCaptain cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainHead - !type:CharacterJobRequirement jobs: - Captain @@ -100,6 +253,8 @@ category: JobsCommandCaptain cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainHead - !type:CharacterJobRequirement jobs: - Captain @@ -115,6 +270,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainNeck - !type:CharacterJobRequirement jobs: - Captain @@ -127,6 +284,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainNeck - !type:CharacterJobRequirement jobs: - Captain @@ -139,18 +298,36 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainNeck - !type:CharacterJobRequirement jobs: - Captain items: - ClothingNeckCloakCapFormal +- type: loadout + id: LoadoutCaptainNeckGoldMedal + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainNeck + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingNeckGoldmedal + # Mask - type: loadout id: LoadoutCommandCapMaskGas category: JobsCommandCaptain cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainMask - !type:CharacterJobRequirement jobs: - Captain @@ -163,32 +340,121 @@ category: JobsCommandCaptain cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainOuter - !type:CharacterJobRequirement jobs: - Captain items: - ClothingOuterWinterCap +- type: loadout + id: LoadoutCaptainOuterCarapace + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainOuter + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingOuterArmorCaptainCarapace + # Shoes - type: loadout - id: LoadoutCommandCapShoesBootsWinter + id: LoadoutCaptainShoesLaceup + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainShoes + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingShoesBootsLaceup + +- type: loadout + id: LoadoutCaptainShoesLeather category: JobsCommandCaptain cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainShoes + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingShoesLeather + +- type: loadout + id: LoadoutCaptainShoesWinter + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainShoes - !type:CharacterJobRequirement jobs: - Captain items: - ClothingShoesBootsWinterCap +- type: loadout + id: LoadoutCaptainShoesCombat + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainShoes + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingShoesBootsCombatFilled + # Uniforms +- type: loadout + id: LoadoutCommandCapJumpsuit + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainUniform + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingUniformJumpsuitCaptain + +- type: loadout + id: LoadoutCommandCapJumpskirt + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainUniform + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingUniformJumpskirtCaptain + - type: loadout id: LoadoutCommandCapJumpsuitFormal category: JobsCommandCaptain cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainUniform - !type:CharacterJobRequirement jobs: - Captain @@ -201,6 +467,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainUniform - !type:CharacterJobRequirement jobs: - Captain diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index 0cb7fdf4aeb..1856b80b027 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -20,6 +20,33 @@ # Eyes # Gloves +- type: loadout + id: LoadoutHeadOfPersonnelGlovesHoP + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelGloves + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingHandsGlovesHop + +- type: loadout + id: LoadoutHeadOfPersonnelGlovesInspection + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelGloves + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingHandsGlovesInspection # Head - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml index d2cadf8e970..37180b31289 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml @@ -12,27 +12,31 @@ cost: 3 exclusive: true requirements: - - !type:CharacterDepartmentRequirement - departments: - - Command + - !type:CharacterItemGroupRequirement + group: LoadoutCommandSelfDefense + - !type:CharacterDepartmentRequirement + departments: + - Command items: - TelescopicBaton -# Eyes - -# Gloves - type: loadout - id: LoadoutCommandGlovesInspection + id: LoadoutCommandDisabler category: JobsCommandAUncategorized cost: 0 exclusive: true requirements: - - !type:CharacterJobRequirement - jobs: - - HeadOfPersonnel - - Captain + - !type:CharacterItemGroupRequirement + group: LoadoutCommandSelfDefense + - !type:CharacterDepartmentRequirement + departments: + - Command items: - - ClothingHandsGlovesInspection + - WeaponDisabler + +# Eyes + +# Gloves # Head diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 9c56881bd81..03d0e84c717 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -78,8 +78,8 @@ state: icon - type: stealTargetGroup - id: WeaponAntiqueLaser - name: antique laser pistol + id: WeaponCaptain + name: captain's weapon sprite: sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi state: base diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index b00d12529af..efdb18f356a 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -177,14 +177,17 @@ components: - type: StealCondition stealGroup: Hypospray + verifyMapExistence: true -- type: entity - noSpawn: true - parent: BaseCMOStealObjective - id: CMOCrewMonitorStealObjective - components: - - type: StealCondition - stealGroup: HandheldCrewMonitor +# This is going back in Loadouts. Not worth fucking over Paramedics. +#- type: entity +# noSpawn: true +# parent: BaseCMOStealObjective +# id: CMOCrewMonitorStealObjective +# components: +# - type: StealCondition +# stealGroup: HandheldCrewMonitor +# verifyMapExistence: true ## rd @@ -205,6 +208,7 @@ components: - type: StealCondition stealGroup: ClothingOuterHardsuitRd + verifyMapExistence: true - type: Objective # This item must be worn or stored in a slowing duffelbag, very hard to hide. difficulty: 3 @@ -216,6 +220,7 @@ components: - type: StealCondition stealGroup: HandTeleporter + verifyMapExistence: true ## hos @@ -231,6 +236,7 @@ job: HeadOfSecurity - type: StealCondition stealGroup: BookSecretDocuments + verifyMapExistence: true owner: job-name-hos ## ce @@ -244,6 +250,7 @@ job: ChiefEngineer - type: StealCondition stealGroup: ClothingShoesBootsMagAdv + verifyMapExistence: true owner: job-name-ce ## qm @@ -257,6 +264,7 @@ job: Quartermaster - type: StealCondition stealGroup: BoxFolderQmClipboard + verifyMapExistence: true owner: job-name-qm ## hop @@ -294,6 +302,7 @@ components: - type: StealCondition stealGroup: CaptainIDCard + verifyMapExistence: true - type: entity noSpawn: true @@ -302,6 +311,7 @@ components: - type: StealCondition stealGroup: JetpackCaptainFilled + verifyMapExistence: true - type: entity noSpawn: true @@ -309,8 +319,9 @@ id: CaptainGunStealObjective components: - type: StealCondition - stealGroup: WeaponAntiqueLaser + stealGroup: WeaponCaptain owner: job-name-captain + verifyMapExistence: true - type: entity noSpawn: true @@ -325,6 +336,7 @@ - type: NotCommandRequirement - type: StealCondition stealGroup: NukeDisk + verifyMapExistence: true owner: objective-condition-steal-station - type: entity diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 219684cc7d7..7e4d4e19a9e 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -47,10 +47,6 @@ jumpsuit: ClothingUniformJumpsuitCaptain back: ClothingBackpackCaptainFilled shoes: ClothingShoesBootsLaceup - head: ClothingHeadHatCaptain - eyes: ClothingEyesGlassesSunglasses - gloves: ClothingHandsGlovesCaptain - outerClothing: ClothingOuterArmorCaptainCarapace id: CaptainPDA ears: ClothingHeadsetAltCommand innerClothingSkirt: ClothingUniformJumpskirtCaptain diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 878b184b8bc..2c50f42baec 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -75,7 +75,6 @@ shoes: ClothingShoesLeather # DeltaV - HoP needs something better than plebe shoes. head: ClothingHeadHatHopcap id: HoPPDA - gloves: ClothingHandsGlovesHop ears: ClothingHeadsetHoP # DeltaV - HoP is now a service role, replaces their all channels headset. belt: BoxFolderClipboard innerClothingSkirt: ClothingUniformJumpskirtHoP From bb0eb44f61327f51702e9164e86564375623a692 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 14:06:49 -0500 Subject: [PATCH 04/27] HoP and Command Uncategorized done --- .../Catalog/Fills/Lockers/heads.yml | 9 - .../Jobs/Command/captain.yml | 2 +- .../Jobs/Command/headOfPersonnel.yml | 104 +++++++ .../Jobs/Command/uncategorized.yml | 14 + .../CharacterItemGroups/backpackGroups.yml | 4 + .../Prototypes/DeltaV/Objectives/traitor.yml | 3 + .../Entities/Clothing/Back/backpacks.yml | 10 + .../Prototypes/Loadouts/Generic/backpacks.yml | 14 - .../Loadouts/Jobs/Command/headOfPersonnel.yml | 271 ++++++++++++++++++ .../Loadouts/Jobs/Command/uncategorized.yml | 44 ++- .../Roles/Jobs/Command/head_of_personnel.yml | 2 - 11 files changed, 450 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index d7d28bb1a13..75ab8eece85 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -99,22 +99,13 @@ - id: BoxID - id: BoxHeadset - id: IDComputerCircuitboard - - id: ClothingOuterCoatHoPArmored # DeltaV - - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite - - id: CigarGoldCase - prob: 0.25 - # Fuck the HoP they don't deserve fucking cigars. - # Yes they do fuck you. - id: DoorRemoteService - - id: ClothingNeckGoldmedal - id: RubberStampHop - id: RubberStampDenied - id: RubberStampApproved - id: BoxEncryptionKeyPassenger - id: BoxEncryptionKeyService - id: AccessConfigurator - - id: BookIanDossier # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml - - id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP. - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml index f1cfbf7f48a..abb45c77a8b 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml @@ -24,7 +24,7 @@ - type: characterItemGroup id: LoadoutCaptainTrinkets - maxItems: 4 + maxItems: 3 items: - type: loadout id: LoadoutCaptainDrinkFlask diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml index e69de29bb2d..cb2093a5ee5 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml @@ -0,0 +1,104 @@ +- type: characterItemGroup + id: LoadoutHeadOfPersonnelBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutHeadOfPersonnelBackpacksBackpack + - type: loadout + id: LoadoutHeadOfPersonnelBackpacksSatchel + - type: loadout + id: LoadoutHeadOfPersonnelBackpacksDuffel + - type: loadout + id: LoadoutHeadOfPersonnelBackpacksBackpackFilled + - type: loadout + id: LoadoutHeadOfPersonnelBackpacksSatchelFilled + - type: loadout + id: LoadoutHeadOfPersonnelBackpacksDuffelFilled + - type: loadout + id: LoadoutCommandHOPBackIan + - type: loadout + id: LoadoutCommandHOPBackIanFilled + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutHeadOfPersonnelBeltClipboard + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelTrinkets + maxItems: 3 + items: + - type: loadout + id: LoadoutHeadOfPersonnelCigarCase + - type: loadout + id: LoadoutHeadOfPersonnelBookIanDossier + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelGloves + maxItems: 1 + items: + - type: loadout + id: LoadoutHeadOfPersonnelGlovesHoP + - type: loadout + id: LoadoutHeadOfPersonnelGlovesInspection + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelHead + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandHOPHatCap + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandHOPNeckMantle + - type: loadout + id: LoadoutCommandHOPNeckCloak + - type: loadout + id: LoadoutCommandHOPBedsheetIan + - type: loadout + id: LoadoutHeadOfPersonnelNeckGoldMedal + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutcommandHOPOuterCoatFormal + - type: loadout + id: LoadoutHeadOfPersonnelOuterWinter + - type: loadout + id: LoadoutHeadOfPersonnelOuterArmoredCoat + - type: loadout + id: LoadoutHeadOfPersonnelOuterDuraVest + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutHeadOfPersonnelShoesLaceup + - type: loadout + id: LoadoutHeadOfPersonnelShoesLeather + - type: loadout + id: LoadoutCommandHOPShoesBootsWinter + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelUniform + maxItems: 1 + items: + - type: loadout + id: LoadoutHeadOfPersonnelUniformJumpsuit + - type: loadout + id: LoadoutHeadOfPersonnelUniformJumpskirt + - type: loadout + id: LoadoutCommandHOPJumpsuitTurtleneckBoatswain + - type: loadout + id: LoadoutCommandHOPJumpsuitMess + - type: loadout + id: LoadoutCommandHOPJumpskirtMess diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml index e69de29bb2d..f94b12d050e 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml @@ -0,0 +1,14 @@ +- type: characterItemGroup + id: LoadoutCommandSelfDefense + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandTelescopicBaton + - type: loadout + id: LoadoutCommandDisabler + - type: loadout + id: LoadoutCommandStunBaton + - type: loadout + id: LoadoutCommandPepperspray + - type: loadout + id: LoadoutCommandFlash diff --git a/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml b/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml index 8ccd4d0453a..b2c5443a350 100644 --- a/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml @@ -7,3 +7,7 @@ id: LoadoutBackpackDuffel - type: loadout id: LoadoutBackpackSatchel + - type: loadout + id: LoadoutItemBackpackSatchelLeather + - type: loadout + id: LoadoutBackpackMerc diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index c5c5318b5d2..2fba100f4fe 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -7,6 +7,7 @@ job: Quartermaster - type: StealCondition stealGroup: SpaceCashLuckyBill + verifyMapExistence: true # owner: job-name-qm - type: entity # Head of Personnel steal objective. @@ -18,6 +19,7 @@ job: HeadOfPersonnel - type: StealCondition stealGroup: BookIanDossier + verifyMapExistence: true # owner: job-name-hop - type: entity # Clerk steal objective. @@ -29,4 +31,5 @@ job: Clerk - type: StealCondition stealGroup: RubberStampNotary + verifyMapExistence: true owner: job-name-clerk diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 4af443113a7..282d65cfccc 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -56,6 +56,16 @@ storageOpenSound: collection: IanBark +- type: entity + parent: ClothingBackpackIan + id: ClothingBackpackIanFilled + name: Ian's backpack + description: Sometimes he wears it. + components: + - type: StorageFill + contents: + - id: Flash + - type: entity parent: ClothingBackpack id: ClothingBackpackSecurity diff --git a/Resources/Prototypes/Loadouts/Generic/backpacks.yml b/Resources/Prototypes/Loadouts/Generic/backpacks.yml index e4dde18bd79..5060fbfc8dd 100644 --- a/Resources/Prototypes/Loadouts/Generic/backpacks.yml +++ b/Resources/Prototypes/Loadouts/Generic/backpacks.yml @@ -23,20 +23,6 @@ jobs: - Clown -- type: loadout - id: LoadoutBackpackIan - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackIan - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - HeadOfPersonnel - - type: loadout id: LoadoutBackpackMime category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index 1856b80b027..0c7d7b106ec 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -1,21 +1,160 @@ # Head Of Personnel # Backpacks +- type: loadout + id: LoadoutHeadOfPersonnelBackpacksBackpack + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingBackpackHOP + +- type: loadout + id: LoadoutHeadOfPersonnelBackpacksSatchel + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingBackpackSatchelHOP + +- type: loadout + id: LoadoutHeadOfPersonnelBackpacksDuffel + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingBackpackDuffelHOP + +- type: loadout + id: LoadoutHeadOfPersonnelBackpacksBackpackFilled + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingBackpackHOPFilled + +- type: loadout + id: LoadoutHeadOfPersonnelBackpacksSatchelFilled + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingBackpackSatchelHOPFilled + +- type: loadout + id: LoadoutHeadOfPersonnelBackpacksDuffelFilled + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingBackpackDuffelHOPFilled + - type: loadout id: LoadoutCommandHOPBackIan category: JobsCommandHeadOfPersonnel cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks - !type:CharacterJobRequirement jobs: - HeadOfPersonnel items: - ClothingBackpackIan +- type: loadout + id: LoadoutCommandHOPBackIanFilled + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBackpacks + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingBackpackIanFilled + # Belt +- type: loadout + id: LoadoutHeadOfPersonnelBeltClipboard + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelBelt + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - BoxFolderClipboard # Ears # Equipment +- type: loadout + id: LoadoutHeadOfPersonnelCigarCase + category: JobsCommandHeadOfPersonnel + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelTrinkets + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - CigarGoldCase + +- type: loadout + id: LoadoutHeadOfPersonnelBookIanDossier + category: JobsCommandHeadOfPersonnel + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelTrinkets + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - BookIanDossier # Eyes @@ -53,7 +192,10 @@ id: LoadoutCommandHOPHatCap category: JobsCommandHeadOfPersonnel cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelHead - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -69,6 +211,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelNeck - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -81,6 +225,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelNeck - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -93,12 +239,28 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelNeck - !type:CharacterJobRequirement jobs: - HeadOfPersonnel items: - BedsheetIan +- type: loadout + id: LoadoutHeadOfPersonnelNeckGoldMedal + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelNeck + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingNeckGoldmedal + # Mask # Outer @@ -106,20 +268,95 @@ id: LoadoutcommandHOPOuterCoatFormal category: JobsCommandHeadOfPersonnel cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelOuter - !type:CharacterJobRequirement jobs: - HeadOfPersonnel items: - ClothingOuterCoatHoPFormal +- type: loadout + id: LoadoutHeadOfPersonnelOuterWinter + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelOuter + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingOuterWinterHoP + +- type: loadout + id: LoadoutHeadOfPersonnelOuterArmoredCoat + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelOuter + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingOuterCoatHoPArmored + +- type: loadout + id: LoadoutHeadOfPersonnelOuterDuraVest + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelOuter + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingOuterArmorDuraVest + # Shoes +- type: loadout + id: LoadoutHeadOfPersonnelShoesLaceup + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelShoes + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingShoesBootsLaceup + +- type: loadout + id: LoadoutHeadOfPersonnelShoesLeather + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelShoes + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingShoesLeather + - type: loadout id: LoadoutCommandHOPShoesBootsWinter category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelShoes - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -127,12 +364,42 @@ - ClothingShoesBootsWinterHeadOfPersonel # Uniforms +- type: loadout + id: LoadoutHeadOfPersonnelUniformJumpsuit + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelUniform + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingUniformJumpsuitHoP + +- type: loadout + id: LoadoutHeadOfPersonnelUniformJumpskirt + category: JobsCommandHeadOfPersonnel + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelUniform + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - ClothingUniformJumpskirtHoP + - type: loadout id: LoadoutCommandHOPJumpsuitTurtleneckBoatswain category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelUniform - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -145,6 +412,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelUniform - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -157,6 +426,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelUniform - !type:CharacterJobRequirement jobs: - HeadOfPersonnel diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml index 37180b31289..8ffbcfe9f1d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml @@ -23,7 +23,7 @@ - type: loadout id: LoadoutCommandDisabler category: JobsCommandAUncategorized - cost: 0 + cost: 2 exclusive: true requirements: - !type:CharacterItemGroupRequirement @@ -34,6 +34,48 @@ items: - WeaponDisabler +- type: loadout + id: LoadoutCommandStunBaton + category: JobsCommandAUncategorized + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCommandSelfDefense + - !type:CharacterDepartmentRequirement + departments: + - Command + items: + - Stunbaton + +- type: loadout + id: LoadoutCommandPepperspray + category: JobsCommandAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCommandSelfDefense + - !type:CharacterDepartmentRequirement + departments: + - Command + items: + - Pepperspray + +- type: loadout + id: LoadoutCommandFlash + category: JobsCommandAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCommandSelfDefense + - !type:CharacterDepartmentRequirement + departments: + - Command + items: + - Flash + # Eyes # Gloves diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 2c50f42baec..feda9c0f466 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -73,10 +73,8 @@ jumpsuit: ClothingUniformJumpsuitHoP back: ClothingBackpackHOPFilled shoes: ClothingShoesLeather # DeltaV - HoP needs something better than plebe shoes. - head: ClothingHeadHatHopcap id: HoPPDA ears: ClothingHeadsetHoP # DeltaV - HoP is now a service role, replaces their all channels headset. - belt: BoxFolderClipboard innerClothingSkirt: ClothingUniformJumpskirtHoP satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled From 80fe6d7d7a3e0f281da7c31df374ef4e6e8fc6e3 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 15:05:43 -0500 Subject: [PATCH 05/27] CE And Atmos Tech Done --- .../Prototypes/Catalog/Fills/Items/belt.yml | 16 +++ .../Catalog/Fills/Lockers/heads.yml | 1 - .../Engineering/atmosphericTechnician.yml | 69 +++++++++ .../Jobs/Engineering/chiefEngineer.yml | 66 +++++++++ .../Jobs/Engineering/seniorEngineer.yml | 0 .../Jobs/Engineering/stationEngineer.yml | 0 .../Jobs/Engineering/technicalAssistant.yml | 0 .../Engineering/uncategorized.yml} | 15 +- .../Jobs/Epistemics/acolyte.yml | 0 .../Jobs/Epistemics/cataloger.yml | 0 .../Jobs/Epistemics/chaplain.yml | 0 .../Jobs/Epistemics/golemancer.yml | 0 .../Jobs/Epistemics/mystagogue.yml | 0 .../Jobs/Epistemics/mystic.yml | 0 .../Jobs/Epistemics/noviciate.yml | 0 .../Jobs/Epistemics/psionicMantis.yml | 0 .../Epistemics/uncategorized.yml} | 0 .../Jobs/Logistics/cargoTechnician.yml | 0 .../Jobs/Logistics/courier.yml | 0 .../Jobs/Logistics/logisticsOfficer.yml | 0 .../Jobs/Logistics/salvageSpecialist.yml | 0 .../Jobs/Logistics/uncategorized.yml | 0 .../Jobs/Medical/chemist.yml | 0 .../Jobs/Medical/chiefMedicalOfficer.yml | 0 .../Jobs/Medical/medicalDoctor.yml | 0 .../Jobs/Medical/medicalIntern.yml | 0 .../Jobs/Medical/paramedic.yml | 0 .../Jobs/Medical/seniorPhysician.yml | 0 .../Medical/uncategorized.yml} | 0 .../Jobs/Security/cadet.yml | 0 .../Jobs/Security/corpsman.yml | 0 .../Jobs/Security/detective.yml | 0 .../Jobs/Security/headOfSecurity.yml | 0 .../Jobs/Security/securityOfficer.yml | 0 .../Jobs/Security/seniorOfficer.yml | 0 .../Security/uncategorized.yml} | 0 .../Jobs/Security/warden.yml | 0 .../Jobs/Service/bartender.yml | 0 .../CharacterItemGroups/Jobs/Service/chef.yml | 0 .../Jobs/Service/clown.yml | 0 .../Jobs/Service/janitor.yml | 0 .../Jobs/Service/lawyer.yml | 0 .../CharacterItemGroups/Jobs/Service/mime.yml | 0 .../Service/musician.yml} | 0 .../Jobs/Service/reporter.yml | 0 .../Service/uncategorized.yml} | 0 .../CharacterItemGroups/cargoGroups.yml | 19 --- .../Engineering/atmosphericTechnician.yml | 133 ++++++++++++++++-- .../Jobs/Engineering/chiefEngineer.yml | 108 +++++++++++++- .../Jobs/Engineering/seniorEngineer.yml | 28 ++++ .../Jobs/Engineering/stationEngineer.yml | 1 + .../Jobs/Engineering/uncategorized.yml | 41 ++++++ .../Engineering/atmospheric_technician.yml | 4 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 2 - 54 files changed, 460 insertions(+), 43 deletions(-) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml rename Resources/Prototypes/CharacterItemGroups/{engineeringGroups.yml => Jobs/Engineering/uncategorized.yml} (75%) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/acolyte.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/noviciate.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml rename Resources/Prototypes/CharacterItemGroups/{scienceGroups.yml => Jobs/Epistemics/uncategorized.yml} (100%) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/courier.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml rename Resources/Prototypes/CharacterItemGroups/{medicalGroups.yml => Jobs/Medical/uncategorized.yml} (100%) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Security/cadet.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Security/securityOfficer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml rename Resources/Prototypes/CharacterItemGroups/{securityGroups.yml => Jobs/Security/uncategorized.yml} (100%) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/chef.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml rename Resources/Prototypes/CharacterItemGroups/{musicianInstrumentsGroups.yml => Jobs/Service/musician.yml} (100%) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml rename Resources/Prototypes/CharacterItemGroups/{serviceGroups.yml => Jobs/Service/uncategorized.yml} (100%) delete mode 100644 Resources/Prototypes/CharacterItemGroups/cargoGroups.yml diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 27dd4c7e9a7..3dc735d04a7 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -26,6 +26,22 @@ - id: Welder - id: Multitool +- type: entity + id: ClothingBeltUtilityAtmos + parent: ClothingBeltUtility + suffix: Engineering + components: + - type: StorageFill + contents: + - id: Crowbar + - id: Wrench + - id: Screwdriver + - id: Wirecutter + - id: Welder + - id: Multitool + - id: GasAnalyzer + - id: HolofanProjector + - type: entity id: ClothingBeltChiefEngineerFilled parent: ClothingBeltChiefEngineer diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 75ab8eece85..9c9088ca7d3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -119,7 +119,6 @@ - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled - id: ClothingShoesBootsMagAdv - id: ClothingHandsGlovesColorYellow - id: CigarCase diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml new file mode 100644 index 00000000000..d861fd44192 --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml @@ -0,0 +1,69 @@ +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadingEngineeringAtmosBackpackBackpack + - type: loadout + id: LoadingEngineeringAtmosBackpackSatchel + - type: loadout + id: LoadingEngineeringAtmosBackpackDuffel + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutAtmosphericTechnicianBeltUtility + - type: loadout + id: LoadoutAtmosphericTechnicianBeltUtilityAtmos + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianEquipment + maxItems: 1 + items: + - type: loadout + id: LoadoutAtmosphericTechnicianEquipmentBoxInflatable + - type: loadout + id: LoadoutAtmosphericTechnicianEquipmentMedkitOxygen + - type: loadout + id: LoadoutAtmosphericTechnicianEquipmentRCD + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianHead + maxItems: 1 + items: + - type: loadout + id: LoadoutAtmosphericTechnicianChickenhead + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianMask + maxItems: 1 + items: + - type: loadout + id: LoadoutAtmosphericTechnicianMaskGasAtmos + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutAtmosphericTechnicianChickenSuit + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutAtmosphericTechnicianShoesWhite + - type: loadout + id: LoadoutAtmosphericTechnicianShoesWork + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianUniform + maxItems: 1 + items: + - type: loadout + id: LoadingEngineeringAtmosUniformSuit + - type: loadout + id: LoadingEngineeringAtmosUniformSkirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml new file mode 100644 index 00000000000..03c6e54c389 --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml @@ -0,0 +1,66 @@ +- type: characterItemGroup + id: LoadoutChiefEngineerBackpack + maxItems: 1 + items: + - type: loadout + id: LoadoutEngineeringChiefEngineerBackpackBackpack + - type: loadout + id: LoadoutEngineeringChiefEngineerBackpackSatchel + - type: loadout + id: LoadoutEngineeringChiefEngineerBackpackDuffel + +- type: characterItemGroup + id: LoadoutChiefEngineerBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutChiefEngineerBelt + - type: loadout + id: LoadoutChiefEngineerBeltFilled + +- type: characterItemGroup + id: LoadoutChiefEngineerEquipment + maxItems: 2 + items: + - type: loadout + id: LoadoutChiefEngineerEquipmentBoxInflatable + - type: loadout + id: LoadoutChiefEngineerEquipmentMedkitOxygen + - type: loadout + id: LoadoutChiefEngineerEquipmentRCD + - type: loadout + id: LoadoutChiefEngineerEquipmentRCDAmmoSpare + +- type: characterItemGroup + id: LoadoutChiefEngineerNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutEngineeringChiefEngineerNeckMantle + - type: loadout + id: LoadoutEngineeringChiefEngineerNeckCloak + - type: loadout + id: LoadoutEngineeringChiefEngineerNeckEngineerMedal + +- type: characterItemGroup + id: LoadoutChiefEngineerOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCEOuterWinter + +- type: characterItemGroup + id: LoadoutChiefEngineerShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutChiefEngineerShoesBootsWinter + +- type: characterItemGroup + id: LoadoutChiefEngineerUniform + maxItems: 1 + items: + - type: loadout + id: LoadoutChiefEngineerUniformSuit + - type: loadout + id: LoadoutEngineeringChiefEngineerUniformSkirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/engineeringGroups.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml similarity index 75% rename from Resources/Prototypes/CharacterItemGroups/engineeringGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml index 6db873cecf6..370391a36c8 100644 --- a/Resources/Prototypes/CharacterItemGroups/engineeringGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml @@ -3,18 +3,23 @@ items: - type: loadout id: LoadoutEngineeringUniformHazard + +- type: characterItemGroup + id: LoadoutEngineeringGloves + maxItems: 1 + items: - type: loadout - id: LoadoutEngineeringUniformJumpskirtSenior + id: LoadoutAtmosphericTechnicianGlovesInsulated - type: loadout - id: LoadoutEngineeringUniformJumpsuitSenior + id: LoadoutAtmosphericTechnicianGlovesCombat + - type: loadout + id: LoadoutAtmosphericTechnicianGlovesMerc - type: characterItemGroup id: LoadoutOuterEngineering items: - type: loadout id: LoadoutEngineeringOuterHazard - - type: loadout - id: LoadoutEngineeringChickenSuit - type: characterItemGroup id: LoadoutHeadEngineering @@ -36,4 +41,4 @@ id: LoadoutEyesEngineering items: - type: loadout - id: LoadoutEngineeringEyesMeson \ No newline at end of file + id: LoadoutEngineeringEyesMeson diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/acolyte.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/acolyte.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/noviciate.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/noviciate.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/scienceGroups.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/scienceGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/courier.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/courier.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/medicalGroups.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/medicalGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/cadet.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/cadet.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/securityOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/securityOfficer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/securityGroups.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/securityGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/chef.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/chef.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/musicianInstrumentsGroups.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/musician.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/musicianInstrumentsGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Service/musician.yml diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/serviceGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml diff --git a/Resources/Prototypes/CharacterItemGroups/cargoGroups.yml b/Resources/Prototypes/CharacterItemGroups/cargoGroups.yml deleted file mode 100644 index 6b12652b33f..00000000000 --- a/Resources/Prototypes/CharacterItemGroups/cargoGroups.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: characterItemGroup - id: LoadoutOuterCargo - items: - - type: loadout - id: LoadoutCargoOuterWinterCargo - - type: loadout - id: LoadoutCargoOuterWinterMiner - -- type: characterItemGroup - id: LoadoutNeckCargo - items: - - type: loadout - id: LoadoutCargoNeckGoliathCloak - -- type: characterItemGroup - id: LoadoutShoesCargo - items: - - type: loadout - id: LoadoutCargoShoesBootsWinterCargo diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml index 7d3b4db56cb..b0417010b3b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml @@ -1,7 +1,7 @@ # Atmospheric Technician # Backpacks - type: loadout - id: LoadingEngineeringAtmosBackpackBackpack + id: LoadoutAtmosphericTechnicianBackpackBackpack category: JobsEngineeringAtmosphericTechnician cost: 0 exclusive: true @@ -15,7 +15,7 @@ - ClothingBackpackAtmospherics - type: loadout - id: LoadingEngineeringAtmosBackpackSatchel + id: LoadoutAtmosphericTechnicianBackpackSatchel category: JobsEngineeringAtmosphericTechnician cost: 0 exclusive: true @@ -29,7 +29,7 @@ - ClothingBackpackSatchelAtmospherics - type: loadout - id: LoadingEngineeringAtmosBackpackDuffel + id: LoadoutAtmosphericTechnicianBackpackDuffel category: JobsEngineeringAtmosphericTechnician cost: 0 exclusive: true @@ -43,26 +43,117 @@ - ClothingBackpackDuffelAtmospherics # Belt +- type: loadout + id: LoadoutAtmosphericTechnicianBeltUtility + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianBelt + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingBeltUtility + +- type: loadout + id: LoadoutAtmosphericTechnicianBeltUtilityAtmos + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianBelt + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingBeltUtilityAtmos # Ears # Equipment +- type: loadout + id: LoadoutAtmosphericTechnicianEquipmentBoxInflatable + category: JobsEngineeringAtmosphericTechnician + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianEquipment + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - BoxInflatable + +- type: loadout + id: LoadoutAtmosphericTechnicianEquipmentMedkitOxygen + category: JobsEngineeringAtmosphericTechnician + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianEquipment + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - MedkitOxygenFilled + +- type: loadout + id: LoadoutAtmosphericTechnicianEquipmentRCD + category: JobsEngineeringAtmosphericTechnician + cost: 2 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianEquipment + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - RCD + - RCDAmmo # Eyes # Gloves # Head - +- type: loadout + id: LoadoutAtmosphericTechnicianChickenhead + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianHead + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingHeadHatChickenhead # Id # Neck # Mask +- type: loadout + id: LoadoutAtmosphericTechnicianMaskGasAtmos + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianMask + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingMaskGasAtmos # Outer - type: loadout - id: LoadoutEngineeringChickenSuit # :) + id: LoadoutAtmosphericTechnicianChickenSuit category: JobsEngineeringAtmosphericTechnician cost: 0 exclusive: true @@ -74,9 +165,35 @@ - AtmosphericTechnician items: - ClothingOuterSuitChicken - - ClothingHeadHatChickenhead # Shoes +- type: loadout + id: LoadoutAtmosphericTechnicianShoesWhite + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianShoes + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingShoesColorWhite + +- type: loadout + id: LoadoutAtmosphericTechnicianShoesWork + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianShoes + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingShoesBootsWork # Uniforms - type: loadout @@ -86,7 +203,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutAtmosphericTechnicianUniforms + group: LoadoutAtmosphericTechnicianUniform - !type:CharacterJobRequirement jobs: - AtmosphericTechnician @@ -100,7 +217,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutAtmosphericTechnicianUniforms + group: LoadoutAtmosphericTechnicianUniform - !type:CharacterJobRequirement jobs: - AtmosphericTechnician diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml index c4e227af260..d05c1f33c2a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml @@ -7,7 +7,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerBackpacks + group: LoadoutChiefEngineerBackpack - !type:CharacterJobRequirement jobs: - ChiefEngineer @@ -21,7 +21,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerBackpacks + group: LoadoutChiefEngineerBackpack - !type:CharacterJobRequirement jobs: - ChiefEngineer @@ -35,7 +35,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerBackpacks + group: LoadoutChiefEngineerBackpack - !type:CharacterJobRequirement jobs: - ChiefEngineer @@ -43,10 +43,90 @@ - ClothingBackpackDuffelChiefEngineerFilled # Belt +- type: loadout + id: LoadoutChiefEngineerBelt + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerBelt + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingBeltChiefEngineer + +- type: loadout + id: LoadoutChiefEngineerBeltFilled + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerBelt + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingBeltChiefEngineerFilled # Ears # Equipment +- type: loadout + id: LoadoutChiefEngineerEquipmentBoxInflatable + category: JobsEngineeringChiefEngineer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - BoxInflatable + +- type: loadout + id: LoadoutChiefEngineerEquipmentMedkitOxygen + category: JobsEngineeringChiefEngineer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - MedkitOxygenFilled + +- type: loadout + id: LoadoutChiefEngineerEquipmentRCD + category: JobsEngineeringChiefEngineer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - RCD + - RCDAmmo + +- type: loadout + id: LoadoutChiefEngineerEquipmentRCDAmmoSpare + category: JobsEngineeringChiefEngineer + cost: 1 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - RCDAmmo + - RCDAmmo # Eyes @@ -63,6 +143,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerNeck - !type:CharacterJobRequirement jobs: - ChiefEngineer @@ -75,12 +157,28 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerNeck - !type:CharacterJobRequirement jobs: - ChiefEngineer items: - ClothingNeckCloakCe +- type: loadout + id: LoadoutEngineeringChiefEngineerNeckEngineerMedal + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerNeck + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingNeckEngineermedal + # Mask # Outer @@ -120,7 +218,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerUniforms + group: LoadoutChiefEngineerUniform - !type:CharacterJobRequirement jobs: - ChiefEngineer @@ -134,7 +232,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerUniforms + group: LoadoutChiefEngineerUniform - !type:CharacterJobRequirement jobs: - ChiefEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml index 510c7703375..fe9177612b6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -41,7 +41,35 @@ - SeniorEngineer items: - ClothingBackpackDuffelEngineeringFilled + # Belt +- type: loadout + id: LoadoutSeniorEngineerBeltUtility + category: JobsEngineeringSeniorEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerBelt + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - ClothingBeltUtility + +- type: loadout + id: LoadoutSeniorEngineerBeltUtilityEngineering + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerBelt + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - ClothingBeltUtilityEngineering # Ears diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml index 0c8c205a4ec..9421e4a6587 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml @@ -44,6 +44,7 @@ # Belt + # Ears # Equipment diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml index d77515f8455..b5b529a222c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml @@ -63,6 +63,47 @@ - ClothingEyesGlassesMeson # Gloves +- type: loadout + id: LoadoutAtmosphericTechnicianGlovesInsulated + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringGloves + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingHandsGlovesColorYellow + +- type: loadout + id: LoadoutAtmosphericTechnicianGlovesCombat + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringGloves + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingHandsGlovesCombat + +- type: loadout + id: LoadoutAtmosphericTechnicianGlovesMerc + category: JobsEngineeringAtmosphericTechnician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringGloves + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingHandsMercGlovesCombat # Head - type: loadout diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 1a6ddbc0c42..a3bba1547a4 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -21,11 +21,9 @@ id: AtmosphericTechnicianGear equipment: jumpsuit: ClothingUniformJumpsuitAtmos - back: ClothingBackpackEngineeringFilled + back: ClothingBackpackAtmospherics shoes: ClothingShoesColorWhite - eyes: ClothingEyesGlassesMeson id: AtmosPDA - belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering innerClothingSkirt: ClothingUniformJumpskirtAtmos satchel: ClothingBackpackSatchelEngineeringFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 2690b9ba016..74ba2ae68d1 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -43,9 +43,7 @@ back: ClothingBackpackChiefEngineerFilled shoes: ClothingShoesColorBrown id: CEPDA - eyes: ClothingEyesGlassesMeson ears: ClothingHeadsetCE - belt: ClothingBeltUtilityEngineering innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer satchel: ClothingBackpackSatchelChiefEngineerFilled duffelbag: ClothingBackpackDuffelChiefEngineerFilled From a8e17abe316f38de6f1849037b2e56419aa075fb Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 15:20:30 -0500 Subject: [PATCH 06/27] Engineering Done --- .../Jobs/Engineering/seniorEngineer.yml | 41 +++++++++ .../Jobs/Engineering/stationEngineer.yml | 8 ++ .../Jobs/Engineering/uncategorized.yml | 12 ++- .../Jobs/Engineering/seniorEngineer.yml | 61 ++++++++++++- .../Jobs/Engineering/stationEngineer.yml | 87 +++---------------- .../Jobs/Engineering/uncategorized.yml | 71 +++++++++++---- 6 files changed, 183 insertions(+), 97 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml index e69de29bb2d..c4782781458 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml @@ -0,0 +1,41 @@ +- type: characterItemGroup + id: LoadoutSeniorEngineerBackpack + maxItems: 1 + items: + - type: loadout + id: LoadoutEngineeringSeniorEngineerBackpackBackpack + - type: loadout + id: LoadoutEngineeringSeniorEngineerBackpackSatchel + - type: loadout + id: LoadoutEngineeringSeniorEngineerBackpackDuffel + +- type: characterItemGroup + id: LoadoutSeniorEngineerBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutSeniorEngineerBeltUtility + - type: loadout + id: LoadoutSeniorEngineerBeltUtilityEngineering + - type: loadout + id: LoadoutSeniorEngineerBeltUtilityAtmos + +- type: characterItemGroup + id: LoadoutSeniorEngineerEquipment + maxItems: 2 + items: + - type: loadout + id: LoadoutSeniorEngineerEquipmentBoxInflatable + - type: loadout + id: LoadoutSeniorEngineerEquipmentMedkitOxygen + - type: loadout + id: LoadoutSeniorEngineerEquipmentRCD + +- type: characterItemGroup + id: LoadoutSeniorEngineerUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutEngineeringUniformJumpskirtSenior + - type: loadout + id: LoadoutEngineeringUniformJumpsuitSenior diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml index e69de29bb2d..340e72ba726 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml @@ -0,0 +1,8 @@ +- type: characterItemGroup + id: LoadoutSeniorEngineerEquipment + maxItems: 2 + items: + - type: loadout + id: LoadoutStationEngineerEquipmentBoxInflatable + - type: loadout + id: LoadoutStationEngineerEquipmentRCD diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml index 370391a36c8..9704849a49c 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml @@ -1,6 +1,10 @@ - type: characterItemGroup - id: LoadoutUniformsEngineering + id: LoadoutEngineeringUniforms items: + - type: loadout + id: LoadoutEngineeringUniformSuit + - type: loadout + id: LoadoutEngineeringUniformSkirt - type: loadout id: LoadoutEngineeringUniformHazard @@ -9,11 +13,11 @@ maxItems: 1 items: - type: loadout - id: LoadoutAtmosphericTechnicianGlovesInsulated + id: LoadoutEngineeringGlovesInsulated - type: loadout - id: LoadoutAtmosphericTechnicianGlovesCombat + id: LoadoutEngineeringGlovesCombat - type: loadout - id: LoadoutAtmosphericTechnicianGlovesMerc + id: LoadoutEngineeringGlovesMerc - type: characterItemGroup id: LoadoutOuterEngineering diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml index fe9177612b6..760ac33f25b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -7,7 +7,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerBackpacks + group: LoadoutSeniorEngineerBackpack - !type:CharacterJobRequirement jobs: - SeniorEngineer @@ -21,7 +21,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerBackpacks + group: LoadoutSeniorEngineerBackpack - !type:CharacterJobRequirement jobs: - SeniorEngineer @@ -35,7 +35,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerBackpacks + group: LoadoutSeniorEngineerBackpack - !type:CharacterJobRequirement jobs: - SeniorEngineer @@ -59,7 +59,7 @@ - type: loadout id: LoadoutSeniorEngineerBeltUtilityEngineering - category: JobsEngineeringAtmosphericTechnician + category: JobsEngineeringSeniorEngineer cost: 0 exclusive: true requirements: @@ -71,9 +71,62 @@ items: - ClothingBeltUtilityEngineering +- type: loadout + id: LoadoutSeniorEngineerBeltUtilityAtmos + category: JobsEngineeringSeniorEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerBelt + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - ClothingBeltUtilityAtmos + # Ears # Equipment +- type: loadout + id: LoadoutSeniorEngineerEquipmentBoxInflatable + category: JobsEngineeringSeniorEngineer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - BoxInflatable + +- type: loadout + id: LoadoutSeniorEngineerEquipmentMedkitOxygen + category: JobsEngineeringSeniorEngineer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - MedkitOxygenFilled + +- type: loadout + id: LoadoutSeniorEngineerEquipmentRCD + category: JobsEngineeringSeniorEngineer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - RCD + - RCDAmmo # Eyes diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml index 9421e4a6587..1d060256452 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml @@ -1,53 +1,37 @@ # Station Engineer # Backpack -- type: loadout - id: LoadoutEngineeringStationEngineerBackpackBackpack - category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutStationEngineerBackpacks - - !type:CharacterJobRequirement - jobs: - - StationEngineer - items: - - ClothingBackpackEngineeringFilled +# Belt + +# Ears + +# Equipment - type: loadout - id: LoadoutEngineeringStationEngineerBackpackSatchel + id: LoadoutStationEngineerEquipmentBoxInflatable category: JobsEngineeringStationEngineer cost: 0 - exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutStationEngineerBackpacks + group: LoadoutStationEngineerEquipment - !type:CharacterJobRequirement jobs: - StationEngineer items: - - ClothingBackpackSatchelEngineeringFilled + - BoxInflatable - type: loadout - id: LoadoutEngineeringStationEngineerBackpackDuffel + id: LoadoutStationEngineerEquipmentRCD category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true + cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutStationEngineerBackpacks + group: LoadoutStationEngineerEquipment - !type:CharacterJobRequirement jobs: - - StationEngineer + - SeniorEngineer items: - - ClothingBackpackDuffelEngineeringFilled - -# Belt - - -# Ears - -# Equipment + - RCD + - RCDAmmo # Eyes @@ -66,46 +50,3 @@ # Shoes # Uniforms -- type: loadout - id: LoadoutEngineeringUniformSuit - category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - items: - - ClothingUniformJumpsuitEngineering - -- type: loadout - id: LoadoutEngineeringUniformSkirt - category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - items: - - ClothingUniformJumpskirtEngineering - -- type: loadout - id: LoadoutEngineeringUniformHazard - category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - items: - - ClothingUniformJumpsuitEngineeringHazard - -# Equipment diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml index b5b529a222c..0ab69328096 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml @@ -64,44 +64,44 @@ # Gloves - type: loadout - id: LoadoutAtmosphericTechnicianGlovesInsulated - category: JobsEngineeringAtmosphericTechnician + id: LoadoutEngineeringGlovesInsulated + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement group: LoadoutEngineeringGloves - - !type:CharacterJobRequirement - jobs: - - AtmosphericTechnician + - !type:CharacterDepartmentRequirement + departments: + - Engineering items: - ClothingHandsGlovesColorYellow - type: loadout - id: LoadoutAtmosphericTechnicianGlovesCombat - category: JobsEngineeringAtmosphericTechnician + id: LoadoutEngineeringGlovesCombat + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement group: LoadoutEngineeringGloves - - !type:CharacterJobRequirement - jobs: - - AtmosphericTechnician + - !type:CharacterDepartmentRequirement + departments: + - Engineering items: - ClothingHandsGlovesCombat - type: loadout - id: LoadoutAtmosphericTechnicianGlovesMerc - category: JobsEngineeringAtmosphericTechnician + id: LoadoutEngineeringGlovesMerc + category: JobsEngineeringAAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement group: LoadoutEngineeringGloves - - !type:CharacterJobRequirement - jobs: - - AtmosphericTechnician + - !type:CharacterDepartmentRequirement + departments: + - Engineering items: - ClothingHandsMercGlovesCombat @@ -214,5 +214,44 @@ # Shoes # Uniforms +- type: loadout + id: LoadoutEngineeringUniformSuit + category: JobsEngineeringAAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringUniforms + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingUniformJumpsuitEngineering -# Equipment +- type: loadout + id: LoadoutEngineeringUniformSkirt + category: JobsEngineeringAAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringUniforms + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingUniformJumpskirtEngineering + +- type: loadout + id: LoadoutEngineeringUniformHazard + category: JobsEngineeringAAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringUniforms + - !type:CharacterJobRequirement + jobs: + - StationEngineer + items: + - ClothingUniformJumpsuitEngineeringHazard From b1dd5ea95416fca3027b6a3329b327cb919c87ef Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 15:25:05 -0500 Subject: [PATCH 07/27] aaaaaaaaaaaa --- .../CharacterItemGroups/Jobs/Engineering/stationEngineer.yml | 2 +- Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml index 340e72ba726..4fb48f1ff59 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml @@ -1,5 +1,5 @@ - type: characterItemGroup - id: LoadoutSeniorEngineerEquipment + id: LoadoutStationEngineerEquipment maxItems: 2 items: - type: loadout diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index d13fd18afdd..39a31db5c8e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -3,7 +3,6 @@ name: job-name-senior-physician description: job-description-senior-physician playTimeTracker: JobSeniorPhysician - setPreference: false # DeltaV - Disable Senior Roles round start selection requirements: - !type:CharacterPlaytimeRequirement tracker: JobChemist From 788401f661b0267fe9ebd685d306a943ebeb95bf Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 15:36:08 -0500 Subject: [PATCH 08/27] aaaaaaaaaaa --- .../Locale/en-US/loadouts/categories.ftl | 6 +-- .../Locale/en-US/loadouts/itemgroups.ftl | 6 +-- .../Jobs/Command/headOfPersonnel.yml | 6 --- .../Jobs/Command/uncategorized.yml | 2 - .../Jobs/Engineering/uncategorized.yml | 11 +++++ .../Loadouts/Jobs/Command/headOfPersonnel.yml | 42 ------------------- .../Loadouts/Jobs/Command/uncategorized.yml | 14 ------- .../Jobs/Engineering/uncategorized.yml | 6 +-- .../Loadouts/Jobs/Epistemics/chaplain.yml | 32 +++++++------- .../Loadouts/Jobs/Epistemics/golemancer.yml | 4 +- .../Loadouts/Jobs/Epistemics/mystic.yml | 6 +-- .../Jobs/Epistemics/psionicMantis.yml | 2 +- .../Jobs/Epistemics/uncategorized.yml | 32 +++++++------- .../Jobs/Logistics/cargoTechnician.yml | 8 ++-- .../Jobs/Logistics/salvageSpecialist.yml | 4 +- .../Loadouts/Jobs/Service/clown.yml | 14 +++---- .../Loadouts/Jobs/Service/lawyer.yml | 16 +++---- .../Prototypes/Loadouts/Jobs/Service/mime.yml | 12 +++--- .../Loadouts/Jobs/Service/reporter.yml | 6 +-- 19 files changed, 88 insertions(+), 141 deletions(-) diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl index 778d0869b73..17b358500b0 100644 --- a/Resources/Locale/en-US/loadouts/categories.ftl +++ b/Resources/Locale/en-US/loadouts/categories.ftl @@ -9,7 +9,7 @@ loadout-category-Head = Head loadout-category-Items = Items loadout-category-Jobs = Jobs loadout-category-JobsAUncategorized = Uncategorized -loadout-category-JobsCargo = Logistics +loadout-category-JobsLogisticsAUncategorized = Logistics loadout-category-JobsCommand = Command loadout-category-JobsCommandAUncategorized = Uncategorized loadout-category-JobsCommandCaptain = Captain @@ -21,10 +21,10 @@ loadout-category-JobsCommandQM = Logistics Officer loadout-category-JobsCommandRD = Mystagogue loadout-category-JobsEngineering = Engineering loadout-category-JobsMedical = Medical -loadout-category-JobsScience = Epistemics +loadout-category-JobsEpistemicsAAUncategorized = Epistemics loadout-category-JobsSecurity = Security loadout-category-JobsService = Service -loadout-category-JobsServiceUncategorized = Uncategorized +loadout-category-JobsServiceAUncategorized = Uncategorized loadout-category-JobsServiceBartender = Bartender loadout-category-JobsServiceBotanist = Botanist loadout-category-JobsServiceChef = Chef diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index dba4cf72a92..0d467e1006e 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -19,9 +19,9 @@ character-item-group-LoadoutBoxKits = Survival Kits character-item-group-LoadoutWritables = Writing Tools # Cargo -character-item-group-LoadoutNeckCargo = Logistics Neckwear -character-item-group-LoadoutOuterCargo = Logistics Outerwear -character-item-group-LoadoutShoesCargo = Logistics Shoes +character-item-group-JobsLogisticsAUncategorized = Logistics Neckwear +character-item-group-JobsLogisticsAUncategorized = Logistics Outerwear +character-item-group-JobsLogisticsAUncategorized = Logistics Shoes # Engineering character-item-group-LoadoutEyesEngineering = Engineering Eyewear diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml index cb2093a5ee5..79f17606572 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml @@ -2,12 +2,6 @@ id: LoadoutHeadOfPersonnelBackpacks maxItems: 1 items: - - type: loadout - id: LoadoutHeadOfPersonnelBackpacksBackpack - - type: loadout - id: LoadoutHeadOfPersonnelBackpacksSatchel - - type: loadout - id: LoadoutHeadOfPersonnelBackpacksDuffel - type: loadout id: LoadoutHeadOfPersonnelBackpacksBackpackFilled - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml index f94b12d050e..bad1faf2f8b 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml @@ -8,7 +8,5 @@ id: LoadoutCommandDisabler - type: loadout id: LoadoutCommandStunBaton - - type: loadout - id: LoadoutCommandPepperspray - type: loadout id: LoadoutCommandFlash diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml index 9704849a49c..214871a0db8 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml @@ -1,3 +1,14 @@ +- type: characterItemGroup + id: LoadoutEngineeringBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutBackpackEngineering + - type: loadout + id: LoadoutBackpackSatchelEngineering + - type: loadout + id: LoadoutBackpackDuffelEngineering + - type: characterItemGroup id: LoadoutEngineeringUniforms items: diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index 0c7d7b106ec..5f4b559c6fa 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -1,47 +1,5 @@ # Head Of Personnel # Backpacks -- type: loadout - id: LoadoutHeadOfPersonnelBackpacksBackpack - category: JobsCommandHeadOfPersonnel - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelBackpacks - - !type:CharacterJobRequirement - jobs: - - HeadOfPersonnel - items: - - ClothingBackpackHOP - -- type: loadout - id: LoadoutHeadOfPersonnelBackpacksSatchel - category: JobsCommandHeadOfPersonnel - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelBackpacks - - !type:CharacterJobRequirement - jobs: - - HeadOfPersonnel - items: - - ClothingBackpackSatchelHOP - -- type: loadout - id: LoadoutHeadOfPersonnelBackpacksDuffel - category: JobsCommandHeadOfPersonnel - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelBackpacks - - !type:CharacterJobRequirement - jobs: - - HeadOfPersonnel - items: - - ClothingBackpackDuffelHOP - - type: loadout id: LoadoutHeadOfPersonnelBackpacksBackpackFilled category: JobsCommandHeadOfPersonnel diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml index 8ffbcfe9f1d..86cf66873d6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/uncategorized.yml @@ -48,20 +48,6 @@ items: - Stunbaton -- type: loadout - id: LoadoutCommandPepperspray - category: JobsCommandAUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutCommandSelfDefense - - !type:CharacterDepartmentRequirement - departments: - - Command - items: - - Pepperspray - - type: loadout id: LoadoutCommandFlash category: JobsCommandAUncategorized diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml index 0ab69328096..99f2738a701 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml @@ -9,7 +9,7 @@ - ClothingBackpackEngineering requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacksEngineering + group: LoadoutEngineeringBackpacks - !type:CharacterDepartmentRequirement departments: - Engineering @@ -23,7 +23,7 @@ - ClothingBackpackSatchelEngineering requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacksEngineering + group: LoadoutEngineeringBackpacks - !type:CharacterDepartmentRequirement departments: - Engineering @@ -37,7 +37,7 @@ - ClothingBackpackDuffelEngineering requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacksEngineering + group: LoadoutEngineeringBackpacks - !type:CharacterDepartmentRequirement departments: - Engineering diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml index 461919aaf83..2b44b59ae55 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutChaplainJumpsuit - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -40,7 +40,7 @@ - type: loadout id: LoadoutChaplainJumpskirt - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -54,7 +54,7 @@ - type: loadout id: LoadoutScienceUniformJumpsuitMonasticRobeDark - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -68,7 +68,7 @@ - type: loadout id: LoadoutScienceUniformJumpsuitMonasticRobeLight - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -83,7 +83,7 @@ # Outer - type: loadout id: LoadoutScienceOuterPlagueSuit - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -97,7 +97,7 @@ - type: loadout id: LoadoutScienceOuterNunRobe - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -111,7 +111,7 @@ - type: loadout id: LoadoutScienceOuterHoodieBlack - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -125,7 +125,7 @@ - type: loadout id: LoadoutScienceOuterHoodieChaplain - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -140,7 +140,7 @@ # Neck - type: loadout id: LoadoutScienceNeckStoleChaplain - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -155,7 +155,7 @@ # Head - type: loadout id: LoadoutScienceHeadHatHoodNunHood - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -169,7 +169,7 @@ - type: loadout id: LoadoutScienceHeadHatPlaguedoctor - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -183,7 +183,7 @@ - type: loadout id: LoadoutScienceHeadHatWitch - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -197,7 +197,7 @@ - type: loadout id: LoadoutScienceHeadHatWitch1 - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -212,7 +212,7 @@ # Mask - type: loadout id: LoadoutScienceMaskPlague - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -227,7 +227,7 @@ # Equipment - type: loadout id: LoadoutChaplainBible - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -241,7 +241,7 @@ - type: loadout id: LoadoutChaplainStamp - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml index 0209bec59ff..9fbfbff43e8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutScienceUniformJumpskirtRoboticist - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -40,7 +40,7 @@ - type: loadout id: LoadoutScienceUniformJumpsuitRoboticist - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml index fcae1ff5e73..1ade83bb8b6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutScienceUniformJumpskirtSenior - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -43,7 +43,7 @@ - type: loadout id: LoadoutScienceUniformJumpsuitSenior - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -61,7 +61,7 @@ # Outer - type: loadout id: LoadoutScienceOuterLabcoatSeniorResearcher - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml index fcf558095f8..ee9a56c3258 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml @@ -22,7 +22,7 @@ # Outer - type: loadout id: LoadoutScienceOuterWinterCoatMantis - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml index 4c687e38034..957c14355bf 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -10,7 +10,7 @@ # Eyes - type: loadout id: LoadoutScienceEyesHudDiagnostic - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 1 exclusive: true requirements: @@ -24,7 +24,7 @@ - type: loadout id: LoadoutScienceEyesEyepatchHudDiag - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 1 exclusive: true requirements: @@ -39,7 +39,7 @@ # Gloves - type: loadout id: LoadoutScienceHandsGlovesColorPurple - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -53,7 +53,7 @@ - type: loadout id: LoadoutScienceHandsGlovesLatex - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -67,7 +67,7 @@ - type: loadout id: LoadoutScienceHandsGlovesRobohands - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -82,7 +82,7 @@ # Head - type: loadout id: LoadoutScienceHeadHatBeret - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -96,7 +96,7 @@ - type: loadout id: LoadoutScienceHeadHatFez - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -128,7 +128,7 @@ # Neck - type: loadout id: LoadoutScienceNeckTieSci - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -142,7 +142,7 @@ - type: loadout id: LoadoutScienceNeckScarfStripedPurple - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -156,7 +156,7 @@ - type: loadout id: LoadoutScienceNeckScarfStripedBlack - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -173,7 +173,7 @@ # Outer - type: loadout id: LoadoutScienceOuterCoat - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -187,7 +187,7 @@ - type: loadout id: LoadoutScienceOuterLabcoat - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -201,7 +201,7 @@ - type: loadout id: LoadoutSciencegOuterCoatRobo - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -215,7 +215,7 @@ - type: loadout id: LoadoutScienceOuterWinterSci - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -229,7 +229,7 @@ - type: loadout id: LoadoutScienceOuterExplorerLabcoat - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: @@ -257,7 +257,7 @@ # Shoes - type: loadout id: LoadoutScienceShoesBootsWinterSci - category: JobsScience + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml index 39a3dd28aa2..7fcfcef25b1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml @@ -22,12 +22,12 @@ # Outer - type: loadout id: LoadoutCargoOuterWinterCargo - category: JobsCargo + category: JobsLogisticsAUncategorized cost: 1 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterCargo + group: JobsLogisticsAUncategorized - !type:CharacterJobRequirement jobs: - CargoTechnician @@ -37,12 +37,12 @@ # Shoes - type: loadout id: LoadoutCargoShoesBootsWinterCargo - category: JobsCargo + category: JobsLogisticsAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesCargo + group: JobsLogisticsAUncategorized - !type:CharacterJobRequirement jobs: - CargoTechnician diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index 631e1f051a5..3477c5f304b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -46,7 +46,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckCargo + group: JobsLogisticsAUncategorized - !type:CharacterJobRequirement jobs: - SalvageSpecialist @@ -66,7 +66,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterCargo + group: JobsLogisticsAUncategorized - !type:CharacterJobRequirement jobs: - SalvageSpecialist diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml index dee98a2a95c..fac4b344056 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutServiceClownOutfitJester - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -42,7 +42,7 @@ - type: loadout id: LoadoutServiceClownOutfitJesterAlt - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -58,7 +58,7 @@ - type: loadout id: LoadoutServiceClownOuterWinter - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 1 exclusive: true requirements: @@ -72,7 +72,7 @@ - type: loadout id: LoadoutServiceClownOuterClownPriest - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -86,7 +86,7 @@ - type: loadout id: LoadoutServiceClownBootsWinter - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -100,7 +100,7 @@ - type: loadout id: LoadoutServiceClownMaskSexy - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -114,7 +114,7 @@ - type: loadout id: LoadoutServiceClownBedsheetClown - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml index 00de8101e0f..45954274876 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutServiceLawyerUniformBlueSuit - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -40,7 +40,7 @@ - type: loadout id: LoadoutServiceLawyerUniformBlueSkirt - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -54,7 +54,7 @@ - type: loadout id: LoadoutServiceLawyerUniformRedSuit - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -68,7 +68,7 @@ - type: loadout id: LoadoutServiceLawyerUniformRedSkirt - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -82,7 +82,7 @@ - type: loadout id: LoadoutServiceLawyerUniformPurpleSuit - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -96,7 +96,7 @@ - type: loadout id: LoadoutServiceLawyerUniformPurpleSkirt - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -110,7 +110,7 @@ - type: loadout id: LoadoutServiceLawyerUniformGoodSuit - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -124,7 +124,7 @@ - type: loadout id: LoadoutServiceLawyerUniformGoodSkirt - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml index ab2fe5bfa19..18583e67e95 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutServiceMimeOuterWinter - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 1 exclusive: true requirements: @@ -40,7 +40,7 @@ - type: loadout id: LoadoutServiceMimeMaskSad - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -54,7 +54,7 @@ - type: loadout id: LoadoutServiceMimeMaskScared - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -68,7 +68,7 @@ - type: loadout id: LoadoutServiceMimeMaskSexy - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -82,7 +82,7 @@ - type: loadout id: LoadoutServiceMimeShoesBootsWinter - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -96,7 +96,7 @@ - type: loadout id: LoadoutServiceMimeBedsheetMime - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml index 3d09480da52..9808833530c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutServiceReporterUniformDetectivesuit - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -40,7 +40,7 @@ - type: loadout id: LoadoutServiceReporterUniformDetectiveskirt - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: @@ -54,7 +54,7 @@ - type: loadout id: LoadoutServiceReporterUniformJournalist - category: JobsServiceUncategorized + category: JobsServiceAUncategorized cost: 0 exclusive: true requirements: From dcc4dd8f76db15f779dcfb705fa325ce3acf89b8 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 16:15:02 -0500 Subject: [PATCH 09/27] More Localizations --- .../Locale/en-US/loadouts/categories.ftl | 70 ++++++++++++++++--- .../Locale/en-US/loadouts/itemgroups.ftl | 6 +- .../Loadouts/Categories/categories.yml | 4 ++ 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl index 17b358500b0..24d5e42e40d 100644 --- a/Resources/Locale/en-US/loadouts/categories.ftl +++ b/Resources/Locale/en-US/loadouts/categories.ftl @@ -7,29 +7,79 @@ loadout-category-Eyes = Eyes loadout-category-Hands = Hands loadout-category-Head = Head loadout-category-Items = Items + +# Jobs loadout-category-Jobs = Jobs loadout-category-JobsAUncategorized = Uncategorized -loadout-category-JobsLogisticsAUncategorized = Logistics + +# Command loadout-category-JobsCommand = Command -loadout-category-JobsCommandAUncategorized = Uncategorized +loadout-category-JobsCommandAUncategorized = All Command loadout-category-JobsCommandCaptain = Captain -loadout-category-JobsCommandCE = Chief Engineer -loadout-category-JobsCommandCMO = Chief Medical Officer -loadout-category-JobsCommandHOP = Head of Personnel -loadout-category-JobsCommandHOS = Head of Security -loadout-category-JobsCommandQM = Logistics Officer -loadout-category-JobsCommandRD = Mystagogue +loadout-category-JobsCommandHeadOfOPersonnel = Head of Personnel + +# Engineering loadout-category-JobsEngineering = Engineering +loadout-category-JobsEngineeringAAUncategorized = All Engineers +loadout-category-JobsEngineeringAtmosphericTechnician = Atmospheric Technician +loadout-category-JobsEngineeringChiefEngineer = Chief Engineer +loadout-category-JobsEngineeringSeniorEngineer = Senior Engineer +loadout-category-JobsEngineeringStationEngineer = Station Engineer +loadout-category-JobsEngineeringTechnicalAssistant = Technical Assistant + +# Epistemics +loadout-category-JobsEpistemics = Epistemics +loadout-category-JobsEpistemicsAAUncategorized = All Epistemiologists +loadout-category-JobsEpistemicsAcolyte = Acolyte +loadout-category-JobsEpistemicsCataloger = Cataloger +loadout-category-JobsEpistemicsChaplain = Chaplain +loadout-category-JobsEpistemicsGolemancer = Golemancer +loadout-category-JobsEpistemicsMystagogue = Mystagogue +loadout-category-JobsEpistemicsMystic = Mystic +loadout-category-JobsEpistemicsNoviciate = Noviciate +loadout-category-JobsEpistemicsPsionicMantis = Psionic Mantis + +# Logistics +loadout-category-JobsLogistics = Logistics +loadout-category-JobsLogisticsAUncategorized = All Logistics +loadout-category-JobsLogisticsCargoTechnician = Cargo Technician +loadout-category-JobsLogisticsCourier = Courier +loadout-category-JobsLogisticsLogisicsOfficer = Logistics Officer +loadout-category-JobsLogisticsSalvageSpecialist = Salvage Specialist + +# Medical loadout-category-JobsMedical = Medical -loadout-category-JobsEpistemicsAAUncategorized = Epistemics +loadout-category-JobsMedicalAUncategorized = All Medical +loadout-category-JobsMedicalChemist = Chemist +loadout-category-JobsMedicalChiefMedicalOfficer = Chief Medical Officer +loadout-category-JobsMedicalMedicalDoctor = Medical Doctor +loadout-category-JobsMedicalParamedic = Paramedic +loadout-category-JobsMedicalSeniorPhysician = Senior Physician + +# Security loadout-category-JobsSecurity = Security +loadout-category-JobsSecurityAUncategorized = All Security +loadout-category-JobsSecurityCadet = Cadet +loadout-category-JobsSecurityCorpsman = Corpsman +loadout-category-JobsSecurityDetective = Detective +loadout-category-JobsSecurityHeadOfSecurity = Head of Security +loadout-category-JobsSecuritySecurityOfficer = Security Officer +loadout-category-JobsSecuritySeniorOfficer = Senior Officer +loadout-category-JobsSecurityWarden = Warden + +# Service loadout-category-JobsService = Service -loadout-category-JobsServiceAUncategorized = Uncategorized +loadout-category-JobsServiceAUncategorized = All Service loadout-category-JobsServiceBartender = Bartender loadout-category-JobsServiceBotanist = Botanist loadout-category-JobsServiceChef = Chef +loadout-category-JobsServiceClown = Clown loadout-category-JobsServiceJanitor = Janitor +loadout-category-JobsServiceLawyer = Lawyer +loadout-category-JobsServiceMime = Mime loadout-category-JobsServiceMusician = Musician +loadout-category-JobsServiceReporter = Reporter + loadout-category-Mask = Mask loadout-category-Neck = Neck loadout-category-Outer = Outer diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index 0d467e1006e..ca4099d94be 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -18,10 +18,8 @@ character-item-group-LoadoutSmokes = Smokeables character-item-group-LoadoutBoxKits = Survival Kits character-item-group-LoadoutWritables = Writing Tools -# Cargo -character-item-group-JobsLogisticsAUncategorized = Logistics Neckwear -character-item-group-JobsLogisticsAUncategorized = Logistics Outerwear -character-item-group-JobsLogisticsAUncategorized = Logistics Shoes +# Logistics + # Engineering character-item-group-LoadoutEyesEngineering = Engineering Eyewear diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml index 74cf349f0d7..5d40027f191 100644 --- a/Resources/Prototypes/Loadouts/Categories/categories.yml +++ b/Resources/Prototypes/Loadouts/Categories/categories.yml @@ -196,6 +196,7 @@ - JobsSecurityAUncategorized - JobsSecurityCadet - JobsSecurityCorpsman + - JobsSecurityDetective - JobsSecurityHeadOfSecurity - JobsSecuritySecurityOfficer - JobsSecuritySeniorOfficer @@ -210,6 +211,9 @@ - type: loadoutCategory id: JobsSecurityCorpsman +- type: loadoutCategory + id: JobsSecurityDetective + - type: loadoutCategory id: JobsSecurityHeadOfSecurity From 608b11727ff64d94d56e22c24836b5deeeb08bc5 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 16:27:56 -0500 Subject: [PATCH 10/27] aaaaaaaaaa --- .../Locale/en-US/loadouts/itemgroups.ftl | 4 +-- .../Jobs/Logistics/cargoTechnician.yml | 13 +++++++++ .../Jobs/Logistics/salvageSpecialist.yml | 27 ++++++++++++++++++ .../Jobs/Security/seniorOfficer.yml | 7 +++++ .../Jobs/Security/uncategorized.yml | 26 ----------------- .../Jobs/Security/warden.yml | 11 ++++++++ .../Jobs/Engineering/seniorEngineer.yml | 18 ------------ .../Loadouts/Jobs/Epistemics/mystic.yml | 6 ---- .../Jobs/Logistics/cargoTechnician.yml | 4 +-- .../Jobs/Logistics/salvageSpecialist.yml | 6 ++-- .../Loadouts/Jobs/Security/seniorOfficer.yml | 28 ++----------------- 11 files changed, 68 insertions(+), 82 deletions(-) diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index ca4099d94be..5d879c70859 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -37,8 +37,8 @@ character-item-group-LoadoutOuterScience = Epistemics Outerwear character-item-group-LoadoutShoesScience = Epistemics Shoes character-item-group-LoadoutUniformsScience = Epistemics Uniforms -# Epistemics - Cataloguer -character-item-group-LoadoutCataloguerUniforms = Cataloguer Uniforms +# Epistemics - Cataloger +character-item-group-LoadoutCataloguerUniforms = Cataloger Uniforms # Epistemics - Chaplain character-item-group-LoadoutChaplainUniforms = Chaplain Uniforms diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml index e69de29bb2d..5f4716f7fd5 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml @@ -0,0 +1,13 @@ +- type: characterItemGroup + id: LoadoutCargoTechnicianOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCargoOuterWinterCargo + +- type: characterItemGroup + id: LoadoutCargoTechnicianShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutCargoShoesBootsWinterCargo diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml index e69de29bb2d..eaaf958db78 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml @@ -0,0 +1,27 @@ +- type: characterItemGroup + id: LoadoutSalvageSpecialistBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutBackpackSalvage + +- type: characterItemGroup + id: LoadoutSalvageSpecialistWeapons + maxItems: 1 + items: + - type: loadout + id: LoadoutCargoWeaponsCrusherDagger + +- type: characterItemGroup + id: LoadoutSalvageSpecialistNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutCargoNeckGoliathCloak + +- type: characterItemGroup + id: LoadoutSalvageSpecialistOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCargoOuterWinterMiner diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml index e69de29bb2d..12164e9a986 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml @@ -0,0 +1,7 @@ +- type: characterItemGroup + id: LoadoutSeniorOfficerUniforms + items: + - type: loadout + id: LoadoutSecurityUniformJumpskirtSenior + - type: loadout + id: LoadoutSecurityUniformJumpsuitSenior diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index 8b9f6f1e0e8..58695b6b1e7 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -9,26 +9,6 @@ id: LoadoutSecurityUniformJumpsuitGrey - type: loadout id: LoadoutSecurityUniformJumpskirtGrey - - type: loadout - id: LoadoutSecurityUniformJumpsuitSenior - - type: loadout - id: LoadoutSecurityUniformJumpskirtSenior - - type: loadout - id: LoadoutSecurityUniformJumpsuitWardenBlue - - type: loadout - id: LoadoutSecurityUniformJumpskirtWardenBlue - - type: loadout - id: LoadoutSecurityUniformJumpsuitWardenGrey - - type: loadout - id: LoadoutSecurityUniformJumpskirtWardenGrey - - type: loadout - id: LoadoutSecurityUniformJumpsuitHoSBlue - - type: loadout - id: LoadoutSecurityUniformJumpskirtHoSBlue - - type: loadout - id: LoadoutSecurityUniformJumpsuitHoSGrey - - type: loadout - id: LoadoutSecurityUniformJumpskirtHoSGrey - type: loadout id: LoadoutUniformJumpsuitSecFormal - type: loadout @@ -45,12 +25,6 @@ id: LoadoutClothingOuterCoatDetective - type: loadout id: LoadoutOuterVestDetective - - type: loadout - id: LoadoutClothingOuterCoatWarden - - type: loadout - id: LoadoutClothingOuterCoatHoSTrench - - type: loadout - id: LoadoutClothingOuterWinterHoS - type: loadout id: LoadoutClothingOuterArmorBasic - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml index e69de29bb2d..d02642a9327 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml @@ -0,0 +1,11 @@ +- type: characterItemGroup + id: LoadoutWardenUniforms + items: + - type: loadout + id: LoadoutUniformJumpsuitWardenBlue + - type: loadout + id: LoadoutUniformJumpsuitWardenGrey + - type: loadout + id: LoadoutUniformJumpskirtWardenBlue + - type: loadout + id: LoadoutUniformJumpskirtWardenGrey diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml index 760ac33f25b..50119f43fff 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -156,15 +156,6 @@ - !type:CharacterJobRequirement jobs: - SeniorEngineer - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobStationEngineer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 216000 # 60 hours items: - ClothingUniformJumpskirtSeniorEngineer @@ -179,14 +170,5 @@ - !type:CharacterJobRequirement jobs: - SeniorEngineer - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobStationEngineer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 216000 # 60 hours items: - ClothingUniformJumpsuitSeniorEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml index 1ade83bb8b6..4fbd0931b1e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml @@ -35,9 +35,6 @@ - !type:CharacterDepartmentRequirement departments: - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours items: - ClothingUniformJumpskirtSeniorResearcher @@ -52,9 +49,6 @@ - !type:CharacterDepartmentRequirement departments: - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours items: - ClothingUniformJumpsuitSeniorResearcher diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml index 7fcfcef25b1..d1e7013e6f6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml @@ -27,7 +27,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: JobsLogisticsAUncategorized + group: LoadoutCargoTechnicianOuter - !type:CharacterJobRequirement jobs: - CargoTechnician @@ -42,7 +42,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: JobsLogisticsAUncategorized + group: LoadoutCargoTechnicianShoes - !type:CharacterJobRequirement jobs: - CargoTechnician diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index 3477c5f304b..61095beefc3 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -9,7 +9,7 @@ - ClothingBackpackSalvage requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutSalvageSpecialistBackpacks - !type:CharacterDepartmentRequirement departments: - Logistics @@ -24,6 +24,8 @@ category: JobsLogisticsSalvageSpecialist cost: 2 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistWeapons - !type:CharacterJobRequirement jobs: - SalvageSpecialist @@ -46,7 +48,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: JobsLogisticsAUncategorized + group: LoadoutSalvageSpecialistNeck - !type:CharacterJobRequirement jobs: - SalvageSpecialist diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml index fa9f7c3aa20..69e47019c3a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml @@ -27,7 +27,7 @@ - type: loadout id: LoadoutSecurityUniformJumpskirtSenior category: JobsSecuritySeniorOfficer - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement @@ -35,25 +35,13 @@ - !type:CharacterJobRequirement jobs: - SeniorOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 7200 # 2 hours - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 216000 # 60 hours items: - ClothingUniformJumpskirtSeniorOfficer - type: loadout id: LoadoutSecurityUniformJumpsuitSenior category: JobsSecuritySeniorOfficer - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement @@ -61,17 +49,5 @@ - !type:CharacterJobRequirement jobs: - SeniorOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 7200 # 2 hours - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 216000 # 60 hours items: - ClothingUniformJumpsuitSeniorOfficer From 329aafe90af8d4e5ec7ce7598d14d9190ef80e72 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 16:45:45 -0500 Subject: [PATCH 11/27] More category fixes --- .../Locale/en-US/loadouts/categories.ftl | 4 +- .../Loadouts/Jobs/Command/captain.yml | 2 +- .../Loadouts/Jobs/Epistemics/mystagogue.yml | 16 +-- .../Jobs/Logistics/logisticsOfficer.yml | 10 +- .../Jobs/Logistics/salvageSpecialist.yml | 2 +- .../Jobs/Medical/chiefMedicalOfficer.yml | 12 +- .../Loadouts/Jobs/Security/corpsman.yml | 4 +- .../Loadouts/Jobs/Security/detective.yml | 4 +- .../Loadouts/Jobs/Security/uncategorized.yml | 134 +++++++++--------- .../Loadouts/Jobs/Security/warden.yml | 4 +- 10 files changed, 96 insertions(+), 96 deletions(-) diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl index 24d5e42e40d..cc2ede24e0b 100644 --- a/Resources/Locale/en-US/loadouts/categories.ftl +++ b/Resources/Locale/en-US/loadouts/categories.ftl @@ -16,7 +16,7 @@ loadout-category-JobsAUncategorized = Uncategorized loadout-category-JobsCommand = Command loadout-category-JobsCommandAUncategorized = All Command loadout-category-JobsCommandCaptain = Captain -loadout-category-JobsCommandHeadOfOPersonnel = Head of Personnel +loadout-category-JobsCommandHeadOfPersonnel = Head of Personnel # Engineering loadout-category-JobsEngineering = Engineering @@ -44,7 +44,7 @@ loadout-category-JobsLogistics = Logistics loadout-category-JobsLogisticsAUncategorized = All Logistics loadout-category-JobsLogisticsCargoTechnician = Cargo Technician loadout-category-JobsLogisticsCourier = Courier -loadout-category-JobsLogisticsLogisicsOfficer = Logistics Officer +loadout-category-JobsLogisticsLogisticsOfficer = Logistics Officer loadout-category-JobsLogisticsSalvageSpecialist = Salvage Specialist # Medical diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 4a07efc8d27..0c68823e806 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -280,7 +280,7 @@ - type: loadout id: LoadoutCommandCapNeckCloak - category: JobsCommand + category: JobsCommandCaptain cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml index 1bfa043654f..e4012d5ba7b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml @@ -28,7 +28,7 @@ # Outer - type: loadout id: LoadoutCommandRDOuterWinter - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 requirements: - !type:CharacterJobRequirement @@ -39,7 +39,7 @@ - type: loadout id: LoadoutCommandRDOuterMysta - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 requirements: - !type:CharacterJobRequirement @@ -51,7 +51,7 @@ # Head - type: loadout id: LoadoutCommandRDHeadHatBeretMysta - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 exclusive: true requirements: @@ -63,7 +63,7 @@ - type: loadout id: LoadoutCommandRDHeadHoodMysta - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 exclusive: true requirements: @@ -76,7 +76,7 @@ # Neck - type: loadout id: LoadoutCommandRDNeckMantle - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 exclusive: true requirements: @@ -88,7 +88,7 @@ - type: loadout id: LoadoutCommandRDNeckCloak - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 exclusive: true requirements: @@ -100,7 +100,7 @@ - type: loadout id: LoadoutCommandRDNeckCloakMystagogue - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 exclusive: true requirements: @@ -113,7 +113,7 @@ # Shoes - type: loadout id: LoadoutCommandRDShoesBootsWinter - category: JobsCommand + category: JobsEpistemicsMystagogue cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml index 440aef4eea1..5d9c2ee7cd1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml @@ -27,7 +27,7 @@ - type: loadout id: LoadoutCommandQMNeckCloak - category: JobsCommand + category: JobsLogisticsLogisticsOfficer cost: 0 exclusive: true requirements: @@ -39,7 +39,7 @@ - type: loadout id: LoadoutCommandQMUniformTurtleneck - category: JobsCommand + category: JobsLogisticsLogisticsOfficer cost: 0 exclusive: true requirements: @@ -51,7 +51,7 @@ - type: loadout id: LoadoutCommandQMUniformTurtleneckSkirt - category: JobsCommand + category: JobsLogisticsLogisticsOfficer cost: 0 exclusive: true requirements: @@ -63,7 +63,7 @@ - type: loadout id: LoadoutCommandQMHeadSoft - category: JobsCommand + category: JobsLogisticsLogisticsOfficer cost: 0 requirements: - !type:CharacterJobRequirement @@ -74,7 +74,7 @@ - type: loadout id: LoadoutCommandQMShoesBootsWinter - category: JobsCommand + category: JobsLogisticsLogisticsOfficer cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index 61095beefc3..a9be43fde75 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -68,7 +68,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: JobsLogisticsAUncategorized + group: LoadoutSalvageSpecialistOuter - !type:CharacterJobRequirement jobs: - SalvageSpecialist diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml index 98e8c23622f..e75df7886a5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml @@ -27,7 +27,7 @@ - type: loadout id: LoadoutCommandCMONeckMantle - category: JobsCommand + category: JobsMedicalChiefMedicalOfficer cost: 0 exclusive: true requirements: @@ -39,7 +39,7 @@ - type: loadout id: LoadoutCommandCMONeckCloak - category: JobsCommand + category: JobsMedicalChiefMedicalOfficer cost: 0 exclusive: true requirements: @@ -51,7 +51,7 @@ - type: loadout id: LoadoutCommandCMOOuterWinter - category: JobsCommand + category: JobsMedicalChiefMedicalOfficer cost: 1 requirements: - !type:CharacterJobRequirement @@ -62,7 +62,7 @@ - type: loadout id: LoadoutCommandCMOOuterLab - category: JobsCommand + category: JobsMedicalChiefMedicalOfficer cost: 0 requirements: - !type:CharacterJobRequirement @@ -73,7 +73,7 @@ - type: loadout id: LoadoutCommandCMOHatBeret - category: JobsCommand + category: JobsMedicalChiefMedicalOfficer cost: 0 requirements: - !type:CharacterJobRequirement @@ -84,7 +84,7 @@ - type: loadout id: LoadoutCommandCMOShoesBootsWinter - category: JobsCommand + category: JobsMedicalChiefMedicalOfficer cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml index 5ac0c9e21f5..320f38f7857 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml @@ -17,7 +17,7 @@ # Belt - type: loadout id: LoadoutClothingBeltCorpsmanWebbing - category: JobsSecurity + category: JobsSecurityCorpsman cost: 0 exclusive: true requirements: @@ -84,7 +84,7 @@ # Neck - type: loadout id: LoadoutBedsheetBrigmedic - category: JobsSecurity + category: JobsSecurityCorpsman cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index f072d8b1193..4d358a8e7f1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -22,7 +22,7 @@ # Outer - type: loadout id: LoadoutClothingOuterCoatDetective - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -36,7 +36,7 @@ - type: loadout id: LoadoutOuterVestDetective - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index ba04c749996..38f92a97f6c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -2,7 +2,7 @@ # Backpack - type: loadout id: LoadoutClothingBackSecurity - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -16,7 +16,7 @@ - type: loadout id: LoadoutClothingBackSecuritySatchel - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingBackSecurityDuffel - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -45,7 +45,7 @@ # Belt - type: loadout id: LoadoutSecurityBeltWebbing - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -59,7 +59,7 @@ - type: loadout id: LoadoutClothingBeltSecurity - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -73,7 +73,7 @@ - type: loadout id: LoadoutClothingBeltHolster - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -93,7 +93,7 @@ # I knew a lot of people in my time working IRL Armed security that did this. - type: loadout id: LoadoutSecurityCombatKnife - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterItemGroupRequirement @@ -106,7 +106,7 @@ - type: loadout id: LoadoutSecurityFlash - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterDepartmentRequirement @@ -117,7 +117,7 @@ - type: loadout id: LoadoutMagazinePistol - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterDepartmentTimeRequirement @@ -133,7 +133,7 @@ - type: loadout id: LoadoutMagazinePistolSpare - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement @@ -149,7 +149,7 @@ - type: loadout id: LoadoutMagazinePistolRubber - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterItemGroupRequirement @@ -162,7 +162,7 @@ - type: loadout id: LoadoutMagazinePistolRubberSpare - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterItemGroupRequirement @@ -175,7 +175,7 @@ - type: loadout id: LoadoutSpeedLoaderMagnum - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -192,7 +192,7 @@ - type: loadout id: LoadoutSpeedLoaderMagnumSpare - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 exclusive: true requirements: @@ -209,7 +209,7 @@ - type: loadout id: LoadoutSpeedLoaderMagnumRubber - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -223,7 +223,7 @@ - type: loadout id: LoadoutSpeedLoaderMagnumRubberSpare - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 exclusive: true requirements: @@ -237,7 +237,7 @@ - type: loadout id: LoadoutMagazineMagnum - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 exclusive: true requirements: @@ -254,7 +254,7 @@ - type: loadout id: LoadoutMagazineMagnumRubber - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 exclusive: true requirements: @@ -271,7 +271,7 @@ - type: loadout id: LoadoutMagazineMagnumSpare - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 exclusive: true requirements: @@ -288,7 +288,7 @@ - type: loadout id: LoadoutMagazineMagnumRubberSpare - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 exclusive: true requirements: @@ -309,7 +309,7 @@ # All lethal options come with a 1 hour security department playtime, as a basic shitter protection. - type: loadout id: LoadoutSecurityDisabler - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterItemGroupRequirement @@ -322,7 +322,7 @@ - type: loadout id: LoadoutSecurityMk58 - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterDepartmentTimeRequirement @@ -338,7 +338,7 @@ - type: loadout id: LoadoutSecurityMk58NonLethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterItemGroupRequirement @@ -351,7 +351,7 @@ - type: loadout id: LoadoutSecurityRevolver - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterDepartmentTimeRequirement @@ -367,7 +367,7 @@ - type: loadout id: LoadoutSecurityRevolverNonLethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 requirements: - !type:CharacterItemGroupRequirement @@ -380,7 +380,7 @@ - type: loadout id: LoadoutSecurityRevolverDeckard - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement @@ -396,7 +396,7 @@ - type: loadout id: LoadoutSecurityRevolverDeckardNonLethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterItemGroupRequirement @@ -409,7 +409,7 @@ - type: loadout id: LoadoutSecurityPistolN1984 - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement @@ -425,7 +425,7 @@ - type: loadout id: LoadoutSecurityPistolN1984NonLethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterItemGroupRequirement @@ -438,7 +438,7 @@ - type: loadout id: LoadoutSecurityPistolViper - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement @@ -454,7 +454,7 @@ - type: loadout id: LoadoutSecurityPistolViperNonLethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterItemGroupRequirement @@ -467,7 +467,7 @@ - type: loadout id: LoadoutSecurityPistolViperWood - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement @@ -483,7 +483,7 @@ - type: loadout id: LoadoutSecurityEquipmentTruncheon - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 3 requirements: - !type:CharacterDepartmentTimeRequirement @@ -502,7 +502,7 @@ - type: loadout id: LoadoutSecurityPistolSvalin - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement @@ -518,7 +518,7 @@ - type: loadout id: LoadoutSecurityEnergyGunMini - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement @@ -534,7 +534,7 @@ - type: loadout id: LoadoutSecurityEnergyGunPistol - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement @@ -550,7 +550,7 @@ - type: loadout id: LoadoutSecurityPistolPollock - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement @@ -566,7 +566,7 @@ - type: loadout id: LoadoutSecurityPistolPollockNonlethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterItemGroupRequirement @@ -579,7 +579,7 @@ - type: loadout id: LoadoutSecurityRevolverSnub - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement @@ -595,7 +595,7 @@ - type: loadout id: LoadoutSecurityRevolverSnubNonlethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 requirements: - !type:CharacterItemGroupRequirement @@ -608,7 +608,7 @@ - type: loadout id: LoadoutSecurityRevolverK38Master - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement @@ -624,7 +624,7 @@ - type: loadout id: LoadoutSecurityRevolverK38MasterNonlethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterItemGroupRequirement @@ -637,7 +637,7 @@ - type: loadout id: LoadoutSecurityRevolverFitz - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterDepartmentTimeRequirement @@ -653,7 +653,7 @@ - type: loadout id: LoadoutSecurityRevolverFitzNonlethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterItemGroupRequirement @@ -666,7 +666,7 @@ - type: loadout id: LoadoutSecurityRevolverPython - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 3 requirements: - !type:CharacterDepartmentTimeRequirement @@ -682,7 +682,7 @@ - type: loadout id: LoadoutSecurityRevolverPythonNonlethal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 3 requirements: - !type:CharacterItemGroupRequirement @@ -696,7 +696,7 @@ # Eyes - type: loadout id: LoadoutSecurityEyesHudSecurity - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -710,7 +710,7 @@ - type: loadout id: ClothingEyesGlassesSunglasses - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -724,7 +724,7 @@ - type: loadout id: LoadoutSecurityEyesEyepatchHudSecurity - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -738,7 +738,7 @@ - type: loadout id: LoadoutSecurityEyesHudSecurityPrescription - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -755,7 +755,7 @@ - type: loadout id: LoadoutClothingEyesGlassesSecurity - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 2 exclusive: true requirements: @@ -772,7 +772,7 @@ # Head - type: loadout id: LoadoutSecurityHeadHatBeret - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -786,7 +786,7 @@ - type: loadout id: LoadoutClothingHeadHelmetBasic - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -800,7 +800,7 @@ - type: loadout id: LoadoutSecurityHeadHelmetInsulated - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 1 requirements: - !type:CharacterItemGroupRequirement @@ -818,7 +818,7 @@ # Mask - type: loadout id: LoadoutSecurityMaskGasSwat - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -834,7 +834,7 @@ # Outer - type: loadout id: LoadoutClothingOuterArmorPlateCarrier - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -848,7 +848,7 @@ - type: loadout id: LoadoutClothingOuterArmorDuraVest - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -862,7 +862,7 @@ - type: loadout id: LoadoutClothingOuterArmorBasic - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -876,7 +876,7 @@ - type: loadout id: LoadoutClothingOuterArmorSlim - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -891,7 +891,7 @@ # Shoes - type: loadout id: LoadoutSecurityShoesJackboots - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -905,7 +905,7 @@ - type: loadout id: LoadoutClothingShoesBootsCombat - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -920,7 +920,7 @@ # Uniforms - type: loadout id: LoadoutSecurityUniformJumpsuitBlue - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -934,7 +934,7 @@ - type: loadout id: LoadoutSecurityUniformJumpsuitGrey - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -948,7 +948,7 @@ - type: loadout id: LoadoutSecurityUniformJumpskirtGrey - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -962,7 +962,7 @@ - type: loadout id: LoadoutSecurityUniformJumpskirtBlue - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -976,7 +976,7 @@ - type: loadout id: LoadoutUniformJumpsuitSecFormal - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: @@ -990,7 +990,7 @@ - type: loadout id: LoadoutUniformJumpsuitSecSummer - category: JobsSecurity + category: JobsSecurityAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 969b1374e65..2edf23e13fa 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -14,7 +14,7 @@ # Head - type: loadout id: LoadoutClothingHeadHatBeretWarden - category: JobsSecurity + category: JobsSecurityWarden cost: 0 exclusive: true requirements: @@ -35,7 +35,7 @@ # Outer - type: loadout id: LoadoutClothingOuterCoatWarden - category: JobsSecurity + category: JobsSecurityWarden cost: 0 exclusive: true requirements: From a75df8047addb28ed9f4be48231ae9af13d76330 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 17:01:14 -0500 Subject: [PATCH 12/27] Okay why the hell are my categories not working? --- .../Locale/en-US/loadouts/categories.ftl | 1 + .../Locale/en-US/loadouts/itemgroups.ftl | 27 ++++++- .../Loadouts/Jobs/Medical/uncategorized.yml | 72 +++++++++---------- .../Loadouts/Jobs/Service/clown.yml | 14 ++-- 4 files changed, 70 insertions(+), 44 deletions(-) diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl index cc2ede24e0b..66e7dd5b76c 100644 --- a/Resources/Locale/en-US/loadouts/categories.ftl +++ b/Resources/Locale/en-US/loadouts/categories.ftl @@ -53,6 +53,7 @@ loadout-category-JobsMedicalAUncategorized = All Medical loadout-category-JobsMedicalChemist = Chemist loadout-category-JobsMedicalChiefMedicalOfficer = Chief Medical Officer loadout-category-JobsMedicalMedicalDoctor = Medical Doctor +loadout-category-JobsMedicalMedicalIntern = Medical Intern loadout-category-JobsMedicalParamedic = Paramedic loadout-category-JobsMedicalSeniorPhysician = Senior Physician diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index 5d879c70859..890537549eb 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -18,8 +18,33 @@ character-item-group-LoadoutSmokes = Smokeables character-item-group-LoadoutBoxKits = Survival Kits character-item-group-LoadoutWritables = Writing Tools -# Logistics +# Command +# Command - Captain +character-item-group-LoadoutCaptainBackpacks = Captain Backpacks +character-item-group-LoadoutCaptainBelt = Captain's Belt +character-item-group-LoadoutCaptainTrinkets = Captain's Trinkets +character-item-group-LoadoutCaptainWeapon = Captain's Personal Weapon +character-item-group-LoadoutCaptainEyes = Captain's Eyewear +character-item-group-LoadoutCaptainGloves = Captain's Gloves +character-item-group-LoadoutCaptainHead = Captain's Headgear +character-item-group-LoadoutCaptainNeck = Captain's Neckwear +character-item-group-LoadoutCaptainMask = Captain's Masks +character-item-group-LoadoutCaptainOuter = Captain's Outerwear +character-item-group-LoadoutCaptainShoes = Captain's Shoes +character-item-group-LoadoutCaptainUniform = Captain's Uniforms + +# Command - Head Of Personnel +character-item-group-LoadoutHeadOfPersonnelBackpacks = HoP's Backpacks +character-item-group-LoadoutHeadOfPersonnelBelt = HoP's Belt +character-item-group-LoadoutHeadOfPersonnelTrinkets = HoP's Trinkets +character-item-group-LoadoutHeadOfPersonnelGloves = HoP's Gloves +character-item-group-LoadoutHeadOfPersonnelHead = HoP's Headgear +character-item-group-LoadoutHeadOfPersonnelNeck = HoP's Neckwear +character-item-group-LoadoutHeadOfPersonnelOuter = HoP's Outerwear +character-item-group-LoadoutHeadOfPersonnelShoes = HoP's Shoes +character-item-group-LoadoutHeadOfPersonnelUniform = HoP's Uniforms +# Logistics # Engineering character-item-group-LoadoutEyesEngineering = Engineering Eyewear diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml index 11851ccad62..d79828e3b7b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml @@ -67,7 +67,7 @@ # Gloves - type: loadout id: LoadoutMedicalGlovesNitrile - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -86,7 +86,7 @@ # Neck - type: loadout id: LoadoutMedicalNeckStethoscope - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -105,7 +105,7 @@ # Outer - type: loadout id: LoadoutMedicalOuterLabcoat - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -120,7 +120,7 @@ - type: loadout id: LoadoutMedicalOuterCybersunWindbreaker - category: JobsMedical + category: JobsMedicalAUncategorized cost: 3 exclusive: true requirements: @@ -139,7 +139,7 @@ # Uniforms - type: loadout id: LoadoutMedicalUniformScrubsBlue - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -156,7 +156,7 @@ - type: loadout id: LoadoutMedicalUniformScrubsGreen - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -173,7 +173,7 @@ - type: loadout id: LoadoutMedicalUniformScrubsPurple - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -190,7 +190,7 @@ - type: loadout id: LoadoutMedicalUniformScrubsCyan - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -207,7 +207,7 @@ - type: loadout id: LoadoutMedicalUniformScrubsBlack - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -224,7 +224,7 @@ - type: loadout id: LoadoutMedicalUniformScrubsPink - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -241,7 +241,7 @@ - type: loadout id: LoadoutMedicalUniformScrubsCybersun - category: JobsMedical + category: JobsMedicalAUncategorized cost: 1 exclusive: true requirements: @@ -257,7 +257,7 @@ - type: loadout id: LoadoutMedicalOuterLabcoatChem - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -271,7 +271,7 @@ - type: loadout id: LoadoutMedicalItemHandLabeler - category: JobsMedical + category: JobsMedicalAUncategorized exclusive: true requirements: - !type:CharacterJobRequirement @@ -282,7 +282,7 @@ - type: loadout id: LoadoutMedicalUniformParamedicJumpsuit - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -296,7 +296,7 @@ - type: loadout id: LoadoutMedicalUniformParamedicJumpskirt - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -310,7 +310,7 @@ - type: loadout id: LoadoutMedicalHeadNurse - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -324,7 +324,7 @@ - type: loadout id: LoadoutMedicalHeadBeretSeniorPhysician - category: JobsMedical + category: JobsMedicalAUncategorized cost: 1 exclusive: true requirements: @@ -350,7 +350,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapBlue - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -367,7 +367,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapPurple - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -384,7 +384,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapGreen - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -401,7 +401,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapCyan - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -418,7 +418,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapBlack - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -435,7 +435,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapPink - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -452,7 +452,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapWhite - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -469,7 +469,7 @@ - type: loadout id: LoadoutMedicalHeadSurgcapCybersun - category: JobsMedical + category: JobsMedicalAUncategorized cost: 1 exclusive: true requirements: @@ -485,7 +485,7 @@ - type: loadout id: LoadoutMedicalEyesHudMedical - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -503,7 +503,7 @@ - type: loadout id: LoadoutMedicalEyesEyepatchHudMedical - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -521,7 +521,7 @@ - type: loadout id: LoadoutMedicalEyesHudMedicalPrescription - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -542,7 +542,7 @@ - type: loadout id: LoadoutMedicalEyesGlassesChemical - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -556,7 +556,7 @@ - type: loadout id: LoadoutMedicalBedsheetMedical - category: JobsMedical + category: JobsMedicalAUncategorized cost: 1 exclusive: true requirements: @@ -571,7 +571,7 @@ # Chemist PPE gear - type: loadout id: LoadoutMedicalUniformJumpsuitChemShirt - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -585,7 +585,7 @@ - type: loadout id: LoadoutMedicalNeckTieChem - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -599,7 +599,7 @@ - type: loadout id: LoadoutMedicalShoesEnclosedChem - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -613,7 +613,7 @@ - type: loadout id: LoadoutMedicalOuterApronChemist - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -627,7 +627,7 @@ - type: loadout id: LoadoutMedicalEyesGlassesChemist - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: @@ -641,7 +641,7 @@ - type: loadout id: LoadoutMedicalHandsGlovesChemist - category: JobsMedical + category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml index fac4b344056..ad3507dcb44 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutServiceClownOutfitJester - category: JobsServiceAUncategorized + category: JobsServiceClown cost: 0 exclusive: true requirements: @@ -42,7 +42,7 @@ - type: loadout id: LoadoutServiceClownOutfitJesterAlt - category: JobsServiceAUncategorized + category: JobsServiceClown cost: 0 exclusive: true requirements: @@ -58,7 +58,7 @@ - type: loadout id: LoadoutServiceClownOuterWinter - category: JobsServiceAUncategorized + category: JobsServiceClown cost: 1 exclusive: true requirements: @@ -72,7 +72,7 @@ - type: loadout id: LoadoutServiceClownOuterClownPriest - category: JobsServiceAUncategorized + category: JobsServiceClown cost: 0 exclusive: true requirements: @@ -86,7 +86,7 @@ - type: loadout id: LoadoutServiceClownBootsWinter - category: JobsServiceAUncategorized + category: JobsServiceClown cost: 0 exclusive: true requirements: @@ -100,7 +100,7 @@ - type: loadout id: LoadoutServiceClownMaskSexy - category: JobsServiceAUncategorized + category: JobsServiceClown cost: 0 exclusive: true requirements: @@ -114,7 +114,7 @@ - type: loadout id: LoadoutServiceClownBedsheetClown - category: JobsServiceAUncategorized + category: JobsServiceClown cost: 0 exclusive: true requirements: From 8fe5be7e73a7936c4d5871c96cd8d54b22b20369 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 16 Nov 2024 18:49:09 -0500 Subject: [PATCH 13/27] More. --- .../Lobby/UI/HumanoidProfileEditor.xaml.cs | 6 +- .../Jobs/Engineering/seniorEngineer.yml | 11 -- .../Jobs/Epistemics/cataloger.yml | 22 +++ .../Jobs/Epistemics/chaplain.yml | 18 +++ .../Jobs/Epistemics/golemancer.yml | 8 ++ .../Jobs/Epistemics/mystagogue.yml | 56 ++++++++ .../Jobs/Epistemics/mystic.yml | 15 ++ .../Jobs/Epistemics/uncategorized.yml | 48 ------- .../Jobs/Engineering/seniorEngineer.yml | 41 ------ .../Loadouts/Jobs/Epistemics/chaplain.yml | 32 ++--- .../Loadouts/Jobs/Epistemics/golemancer.yml | 8 +- .../Loadouts/Jobs/Epistemics/mystagogue.yml | 134 ++++++++++++++---- .../Loadouts/Jobs/Epistemics/mystic.yml | 31 ++-- .../Jobs/Epistemics/uncategorized.yml | 1 - .../Roles/Jobs/Science/senior_researcher.yml | 1 - 15 files changed, 263 insertions(+), 169 deletions(-) diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index 3f526981a4e..57e13821077 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -2289,7 +2289,11 @@ private Dictionary CreateTree(List cat return match; foreach (var subcategory in parent.Contents.Where(c => c is NeoTabContainer).Cast()) - match = FindCategory(id, subcategory); + { + var res = FindCategory(id, subcategory); + if (res != null) + match ??= res; + } return match; } diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml index c4782781458..abc6700010c 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml @@ -1,14 +1,3 @@ -- type: characterItemGroup - id: LoadoutSeniorEngineerBackpack - maxItems: 1 - items: - - type: loadout - id: LoadoutEngineeringSeniorEngineerBackpackBackpack - - type: loadout - id: LoadoutEngineeringSeniorEngineerBackpackSatchel - - type: loadout - id: LoadoutEngineeringSeniorEngineerBackpackDuffel - - type: characterItemGroup id: LoadoutSeniorEngineerBelt maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml index e69de29bb2d..ded12b6b342 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml @@ -0,0 +1,22 @@ +# Cataloguer +- type: characterItemGroup + id: LoadoutCataloguerUniforms + items: + - type: loadout + id: LoadoutScienceJumpsuitLibrarianNt + - type: loadout + id: LoadoutScienceJumpsuitLibrarianIdris + - type: loadout + id: LoadoutScienceJumpsuitLibrarianOrion + - type: loadout + id: LoadoutScienceJumpsuitLibrarianHeph + - type: loadout + id: LoadoutScienceJumpsuitLibrarianPMCG + - type: loadout + id: LoadoutScienceJumpsuitLibrarianZav + - type: loadout + id: LoadoutScienceJumpsuitLibrarianZeng + - type: loadout + id: LoadoutScienceJumpsuitLibrarian + - type: loadout + id: LoadoutScienceJumpskirtLibrarian diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml index e69de29bb2d..a6985002190 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml @@ -0,0 +1,18 @@ +# Chaplain +- type: characterItemGroup + id: LoadoutChaplainUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutChaplainJumpsuit + - type: loadout + id: LoadoutChaplainJumpskirt + +- type: characterItemGroup + id: LoadoutChaplainEquipment + maxItems: 2 + items: + - type: loadout + id: LoadoutChaplainBible + - type: loadout + id: LoadoutChaplainStamp diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml index e69de29bb2d..142c23b155f 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml @@ -0,0 +1,8 @@ +- type: characterItemGroup + id: LoadoutGolemancerUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceUniformJumpskirtRoboticist + - type: loadout + id: LoadoutScienceUniformJumpsuitRoboticist diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml index e69de29bb2d..bef41d9466c 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml @@ -0,0 +1,56 @@ +# Mystagogue +- type: characterItemGroup + id: LoadoutMystagogueBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutMystagogueBackpacksBackpack + - type: loadout + id: LoadoutMystagogueBackpacksSatchel + - type: loadout + id: LoadoutMystagogueBackpacksDuffel + +- type: characterItemGroup + id: LoadoutMystagogueOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandRDOuterWinter + - type: loadout + id: LoadoutCommandRDOuterMysta + +- type: characterItemGroup + id: LoadoutMystagogueHead + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandRDHeadHatBeretMysta + - type: loadout + id: LoadoutCommandRDHeadHoodMysta + +- type: characterItemGroup + id: LoadoutMystagogueNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandRDNeckMantle + - type: loadout + id: LoadoutCommandRDNeckCloak + - type: loadout + id: LoadoutCommandRDNeckCloakMystagogue + +- type: characterItemGroup + id: LoadoutMystagogueShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandRDShoesBootsWinter + +- type: characterItemGroup + id: LoadoutMystagogueUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutMystagogueUniformJumpsuit + - type: loadout + id: LoadoutMystagogueUniformJumpskirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml index e69de29bb2d..b646915ab2b 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml @@ -0,0 +1,15 @@ +- type: characterItemGroup + id: LoadoutMysticUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceUniformJumpskirtSenior + - type: loadout + id: LoadoutScienceUniformJumpsuitSenior + +- type: characterItemGroup + id: LoadoutMysticOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceOuterLabcoatSeniorResearcher diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml index 26cb07dae9c..50a637446bd 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml @@ -1,14 +1,6 @@ - type: characterItemGroup id: LoadoutUniformsScience items: - - type: loadout - id: LoadoutScienceUniformJumpskirtSenior - - type: loadout - id: LoadoutScienceUniformJumpsuitSenior - - type: loadout - id: LoadoutScienceUniformJumpskirtRoboticist - - type: loadout - id: LoadoutScienceUniformJumpsuitRoboticist - type: loadout id: LoadoutScienceUniformJumpsuitMonasticRobeDark - type: loadout @@ -102,43 +94,3 @@ - type: loadout id: LoadoutScienceShoesBootsWinterSci -# Cataloguer -- type: characterItemGroup - id: LoadoutCataloguerUniforms - items: - - type: loadout - id: LoadoutScienceJumpsuitLibrarianNt - - type: loadout - id: LoadoutScienceJumpsuitLibrarianIdris - - type: loadout - id: LoadoutScienceJumpsuitLibrarianOrion - - type: loadout - id: LoadoutScienceJumpsuitLibrarianHeph - - type: loadout - id: LoadoutScienceJumpsuitLibrarianPMCG - - type: loadout - id: LoadoutScienceJumpsuitLibrarianZav - - type: loadout - id: LoadoutScienceJumpsuitLibrarianZeng - - type: loadout - id: LoadoutScienceJumpsuitLibrarian - - type: loadout - id: LoadoutScienceJumpskirtLibrarian - -# Chaplain -- type: characterItemGroup - id: LoadoutChaplainUniforms - items: - - type: loadout - id: LoadoutChaplainJumpsuit - - type: loadout - id: LoadoutChaplainJumpskirt - -- type: characterItemGroup - id: LoadoutChaplainEquipment - maxItems: 2 - items: - - type: loadout - id: LoadoutChaplainBible - - type: loadout - id: LoadoutChaplainStamp diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml index 50119f43fff..93ebe01eab1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -1,46 +1,5 @@ # Senior Engineer # Backpacks -- type: loadout - id: LoadoutEngineeringSeniorEngineerBackpackBackpack - category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerBackpack - - !type:CharacterJobRequirement - jobs: - - SeniorEngineer - items: - - ClothingBackpackEngineeringFilled - -- type: loadout - id: LoadoutEngineeringSeniorEngineerBackpackSatchel - category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerBackpack - - !type:CharacterJobRequirement - jobs: - - SeniorEngineer - items: - - ClothingBackpackSatchelEngineeringFilled - -- type: loadout - id: LoadoutEngineeringSeniorEngineerBackpackDuffel - category: JobsEngineeringStationEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerBackpack - - !type:CharacterJobRequirement - jobs: - - SeniorEngineer - items: - - ClothingBackpackDuffelEngineeringFilled # Belt - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml index 2b44b59ae55..548f89250ad 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutChaplainJumpsuit - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -40,7 +40,7 @@ - type: loadout id: LoadoutChaplainJumpskirt - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -54,7 +54,7 @@ - type: loadout id: LoadoutScienceUniformJumpsuitMonasticRobeDark - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -68,7 +68,7 @@ - type: loadout id: LoadoutScienceUniformJumpsuitMonasticRobeLight - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -83,7 +83,7 @@ # Outer - type: loadout id: LoadoutScienceOuterPlagueSuit - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -97,7 +97,7 @@ - type: loadout id: LoadoutScienceOuterNunRobe - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -111,7 +111,7 @@ - type: loadout id: LoadoutScienceOuterHoodieBlack - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -125,7 +125,7 @@ - type: loadout id: LoadoutScienceOuterHoodieChaplain - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -140,7 +140,7 @@ # Neck - type: loadout id: LoadoutScienceNeckStoleChaplain - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -155,7 +155,7 @@ # Head - type: loadout id: LoadoutScienceHeadHatHoodNunHood - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -169,7 +169,7 @@ - type: loadout id: LoadoutScienceHeadHatPlaguedoctor - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -183,7 +183,7 @@ - type: loadout id: LoadoutScienceHeadHatWitch - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -197,7 +197,7 @@ - type: loadout id: LoadoutScienceHeadHatWitch1 - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -212,7 +212,7 @@ # Mask - type: loadout id: LoadoutScienceMaskPlague - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -227,7 +227,7 @@ # Equipment - type: loadout id: LoadoutChaplainBible - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: @@ -241,7 +241,7 @@ - type: loadout id: LoadoutChaplainStamp - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml index 9fbfbff43e8..f3972aa05b0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml @@ -26,12 +26,12 @@ # Uniforms - type: loadout id: LoadoutScienceUniformJumpskirtRoboticist - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsGolemancer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience + group: LoadoutGolemancerUniforms - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -40,12 +40,12 @@ - type: loadout id: LoadoutScienceUniformJumpsuitRoboticist - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsGolemancer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience + group: LoadoutGolemancerUniforms - !type:CharacterDepartmentRequirement departments: - Epistemics diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml index e4012d5ba7b..7b3c1d0f93d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml @@ -1,52 +1,56 @@ # Mystagogue # Backpacks +- type: loadout + id: LoadoutMystagogueBackpacksBackpack + category: JobsEpistemicsMystagogue + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueBackpacks + - !type:CharacterJobRequirement + jobs: + - ResearchDirector + items: + - ClothingBackpackResearchDirectorFilled -# Belt - -# Ears - -# Equipment - -# Eyes - -# Gloves - -# Head - -# Id - -# Neck - -# Mask - -# Outer - -# Shoes - -# Uniforms - -# Outer - type: loadout - id: LoadoutCommandRDOuterWinter + id: LoadoutMystagogueBackpacksSatchel category: JobsEpistemicsMystagogue cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueBackpacks - !type:CharacterJobRequirement jobs: - ResearchDirector items: - - ClothingOuterWinterRD + - ClothingBackpackSatchelResearchDirectorFilled - type: loadout - id: LoadoutCommandRDOuterMysta + id: LoadoutMystagogueBackpacksDuffel category: JobsEpistemicsMystagogue cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueBackpacks - !type:CharacterJobRequirement jobs: - ResearchDirector items: - - ClothingOuterCoatRndMysta + - ClothingBackpackDuffelResearchDirectorFilled + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves # Head - type: loadout @@ -55,6 +59,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueHead - !type:CharacterJobRequirement jobs: - ResearchDirector @@ -67,12 +73,16 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueHead - !type:CharacterJobRequirement jobs: - ResearchDirector items: - ClothingHeadHoodMysta +# Id + # Neck - type: loadout id: LoadoutCommandRDNeckMantle @@ -80,6 +90,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueNeck - !type:CharacterJobRequirement jobs: - ResearchDirector @@ -92,6 +104,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueNeck - !type:CharacterJobRequirement jobs: - ResearchDirector @@ -104,12 +118,43 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueNeck - !type:CharacterJobRequirement jobs: - ResearchDirector items: - ClothingNeckCloakMystagogue +# Mask + +# Outer +- type: loadout + id: LoadoutCommandRDOuterWinter + category: JobsEpistemicsMystagogue + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueOuter + - !type:CharacterJobRequirement + jobs: + - ResearchDirector + items: + - ClothingOuterWinterRD + +- type: loadout + id: LoadoutCommandRDOuterMysta + category: JobsEpistemicsMystagogue + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueOuter + - !type:CharacterJobRequirement + jobs: + - ResearchDirector + items: + - ClothingOuterCoatRndMysta + # Shoes - type: loadout id: LoadoutCommandRDShoesBootsWinter @@ -117,8 +162,39 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueShoes - !type:CharacterJobRequirement jobs: - ResearchDirector items: - ClothingShoesBootsWinterMystagogue + +# Uniforms +- type: loadout + id: LoadoutMystagogueUniformJumpsuit + category: JobsEpistemicsMystagogue + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueUniforms + - !type:CharacterJobRequirement + jobs: + - ResearchDirector + items: + - ClothingUniformJumpsuitResearchDirector + +- type: loadout + id: LoadoutMystagogueUniformJumpskirt + category: JobsEpistemicsMystagogue + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueUniforms + - !type:CharacterJobRequirement + jobs: + - ResearchDirector + items: + - ClothingUniformJumpskirtResearchDirector diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml index 4fbd0931b1e..dc279d238a4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml @@ -26,29 +26,29 @@ # Uniforms - type: loadout id: LoadoutScienceUniformJumpskirtSenior - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsMystic cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics + group: LoadoutMysticUniforms + - !type:CharacterJobRequirement + jobs: + - SeniorResearcher items: - ClothingUniformJumpskirtSeniorResearcher - type: loadout id: LoadoutScienceUniformJumpsuitSenior - category: JobsEpistemicsAAUncategorized + category: JobsEpistemicsMystic cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics + group: LoadoutMysticUniforms + - !type:CharacterJobRequirement + jobs: + - SeniorResearcher items: - ClothingUniformJumpsuitSeniorResearcher @@ -60,12 +60,9 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours + group: LoadoutMysticOuter + - !type:CharacterJobRequirement + jobs: + - SeniorResearcher items: - ClothingOuterCoatLabSeniorResearcher diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml index 957c14355bf..f2e3f796545 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -122,7 +122,6 @@ departments: - Epistemics - # Id # Neck diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 25b170a46e6..ecb61b36f4a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -3,7 +3,6 @@ name: job-name-senior-researcher description: job-description-senior-researcher playTimeTracker: JobSeniorResearcher - setPreference: true requirements: - !type:CharacterDepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science From cdd3b412e41b3692be45d5bc964664ee6a471c9e Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 17 Nov 2024 16:54:13 -0500 Subject: [PATCH 14/27] aaaaaaaaaaaaaaaaaaaaa --- .../Prototypes/Catalog/Fills/Items/belt.yml | 18 + .../Objects/Specific/Medical/healing.yml | 13 + .../Loadouts/Generic/duffelbags.yml | 56 -- .../Prototypes/Loadouts/Generic/satchels.yml | 42 -- .../Loadouts/Jobs/Command/captain.yml | 16 + .../Loadouts/Jobs/Command/headOfPersonnel.yml | 16 + .../Jobs/Engineering/chiefEngineer.yml | 16 + .../Jobs/Engineering/seniorEngineer.yml | 26 + .../Loadouts/Jobs/Epistemics/cataloger.yml | 12 + .../Loadouts/Jobs/Epistemics/chaplain.yml | 132 ++--- .../Loadouts/Jobs/Epistemics/mystagogue.yml | 16 + .../Loadouts/Jobs/Epistemics/mystic.yml | 28 +- .../Jobs/Logistics/logisticsOfficer.yml | 16 + .../Loadouts/Jobs/Medical/chemist.yml | 274 ++++++++- .../Jobs/Medical/chiefMedicalOfficer.yml | 122 +++- .../Loadouts/Jobs/Medical/medicalDoctor.yml | 13 + .../Loadouts/Jobs/Medical/paramedic.yml | 27 + .../Loadouts/Jobs/Medical/seniorPhysician.yml | 35 +- .../Loadouts/Jobs/Medical/uncategorized.yml | 524 ++++++++---------- .../Loadouts/Jobs/Security/headOfSecurity.yml | 1 + .../Prototypes/Roles/Jobs/Medical/chemist.yml | 2 - 21 files changed, 876 insertions(+), 529 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 3dc735d04a7..5c814a6be84 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -99,6 +99,24 @@ - id: Gauze - id: EmergencyMedipen #You never know what people are going to latejoin into +- type: entity + id: ClothingBeltMedicalAdvancedFilled + parent: ClothingBeltMedical + suffix: Filled + components: + - type: StorageFill + contents: + - id: MedicatedSuture + amount: 2 + - id: RegenerativeMesh + amount: 1 + - id: Bloodpack + amount: 1 + - id: Gauze + - id: EmergencyMedipen + - id: BruteAutoInjector + - id: BurnAutoInjector + - type: entity id: ClothingBeltMedicalEMTFilled parent: ClothingBeltMedicalEMT diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 252f2f48eae..03703aad1e1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -584,6 +584,19 @@ - ReagentId: SpaceDrugs Quantity: 15 +- type: entity + name: pill canister (LSD 15u) + parent: PillCanister + id: PillCanisterSpaceDrugs + suffix: Space Drugs, 5 + components: + - type: Label + currentLabel: LSD 15u + - type: StorageFill + contents: + - id: PillSpaceDrugs + amount: 5 + - type: entity name: pill (tricordrazine 10u) parent: Pill diff --git a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml index b3850389fd6..37cfafbb877 100644 --- a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml @@ -51,20 +51,6 @@ jobs: - Brigmedic -- type: loadout - id: LoadoutBackpackDuffelMedical - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelMedical - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackDuffelMime category: Backpacks @@ -79,20 +65,6 @@ jobs: - Mime -- type: loadout - id: LoadoutBackpackDuffelChemistry - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelChemistry - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackDuffelHydroponics category: Backpacks @@ -135,34 +107,6 @@ departments: - Epistemics -- type: loadout - id: LoadoutBackpackDuffelVirology - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelVirology - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - -- type: loadout - id: LoadoutBackpackDuffelGenetics - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelGenetics - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackDuffelCargo category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Generic/satchels.yml b/Resources/Prototypes/Loadouts/Generic/satchels.yml index 4d2f94a0966..eec78f1c570 100644 --- a/Resources/Prototypes/Loadouts/Generic/satchels.yml +++ b/Resources/Prototypes/Loadouts/Generic/satchels.yml @@ -78,20 +78,6 @@ jobs: - Mime -- type: loadout - id: LoadoutBackpackSatchelChemistry - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelChemistry - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackSatchelHydroponics category: Backpacks @@ -134,34 +120,6 @@ departments: - Epistemics -- type: loadout - id: LoadoutBackpackSatchelVirology - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelVirology - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - -- type: loadout - id: LoadoutBackpackSatchelGenetics - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelGenetics - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackSatchelCargo category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 0c68823e806..ae564e127eb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -262,6 +262,22 @@ - ClothingHeadHatBeretCap # Id +- type: loadout + id: LoadoutCaptainNTPDA + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobCaptain + min: 36000 # 10 hours + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainId + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - CaptainNTPDA # Neck - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index 5f4b559c6fa..1190e9b36c6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -161,6 +161,22 @@ - ClothingHeadHatHopcap # Id +- type: loadout + id: LoadoutHeadOfPersonnelNTPDA + category: JobsMedicalChiefMedicalOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobHeadOfPersonnel + min: 36000 # 10 hours + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfPersonnelHeadId + - !type:CharacterJobRequirement + jobs: + - HeadOfPersonnel + items: + - HoPNTPDA # Neck - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml index d05c1f33c2a..5fdb90b567d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml @@ -135,6 +135,22 @@ # Head # Id +- type: loadout + id: LoadoutChiefEngineerNTPDA + category: JobsEngineeringChiefEngineer + cost: 0 + exclusive: true + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobChiefEngineer + min: 36000 # 10 hours + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerId + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - CENTPDA # Neck - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml index 93ebe01eab1..c507d073cdb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -87,6 +87,32 @@ - RCD - RCDAmmo +- type: loadout + id: LoadoutSeniorEngineerEquipmentRCDAmmo1 + category: JobsEngineeringSeniorEngineer + cost: 1 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - RCDAmmo + +- type: loadout + id: LoadoutSeniorEngineerEquipmentRCDAmmo2 + category: JobsEngineeringSeniorEngineer + cost: 1 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorEngineerEquipment + - !type:CharacterJobRequirement + jobs: + - SeniorEngineer + items: + - RCDAmmo + # Eyes # Gloves diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml index ba986472827..b32b13bbb43 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml @@ -6,6 +6,18 @@ # Ears # Equipment +#- type: loadout +# id: LoadoutCatalogerEquipmentPotentiometer +# category: JobsEpistemicsCataloger +# cost: 0 +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutCataloguerUniforms +# - !type:CharacterJobRequirement +# jobs: +# - Librarian +# items: +# - PsiPotentiometerHandheld # Eyes diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml index 548f89250ad..81c03a80ec4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml @@ -6,249 +6,239 @@ # Ears # Equipment - -# Eyes - -# Gloves - -# Head - -# Id - -# Neck - -# Mask - -# Outer - -# Shoes - -# Uniforms - type: loadout - id: LoadoutChaplainJumpsuit + id: LoadoutChaplainBible category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChaplainUniforms + group: LoadoutChaplainEquipment - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingUniformJumpsuitChaplain + - Bible - type: loadout - id: LoadoutChaplainJumpskirt + id: LoadoutChaplainStamp category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChaplainUniforms + group: LoadoutChaplainEquipment - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingUniformJumpskirtChaplain + - RubberStampChaplain + +# Eyes + +# Gloves +# Head - type: loadout - id: LoadoutScienceUniformJumpsuitMonasticRobeDark + id: LoadoutScienceHeadHatHoodNunHood category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience + group: LoadoutHeadScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingUniformJumpsuitMonasticRobeDark + - ClothingHeadHatHoodNunHood - type: loadout - id: LoadoutScienceUniformJumpsuitMonasticRobeLight + id: LoadoutScienceHeadHatPlaguedoctor category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience + group: LoadoutHeadScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingUniformJumpsuitMonasticRobeLight + - ClothingHeadHatPlaguedoctor -# Outer - type: loadout - id: LoadoutScienceOuterPlagueSuit + id: LoadoutScienceHeadHatWitch category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutHeadScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingOuterPlagueSuit + - ClothingHeadHatWitch - type: loadout - id: LoadoutScienceOuterNunRobe + id: LoadoutScienceHeadHatWitch1 category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutHeadScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingOuterNunRobe + - ClothingHeadHatWitch1 + +# Id +# Neck - type: loadout - id: LoadoutScienceOuterHoodieBlack + id: LoadoutScienceNeckStoleChaplain category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutNeckScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingOuterHoodieBlack + - ClothingNeckStoleChaplain +# Mask - type: loadout - id: LoadoutScienceOuterHoodieChaplain + id: LoadoutScienceMaskPlague category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutMaskScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingOuterHoodieChaplain + - ClothingMaskPlague -# Neck +# Outer - type: loadout - id: LoadoutScienceNeckStoleChaplain + id: LoadoutScienceOuterPlagueSuit category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience + group: LoadoutOuterScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingNeckStoleChaplain + - ClothingOuterPlagueSuit -# Head - type: loadout - id: LoadoutScienceHeadHatHoodNunHood + id: LoadoutScienceOuterNunRobe category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutOuterScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingHeadHatHoodNunHood + - ClothingOuterNunRobe - type: loadout - id: LoadoutScienceHeadHatPlaguedoctor + id: LoadoutScienceOuterHoodieBlack category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutOuterScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingHeadHatPlaguedoctor + - ClothingOuterHoodieBlack - type: loadout - id: LoadoutScienceHeadHatWitch + id: LoadoutScienceOuterHoodieChaplain category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutOuterScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingHeadHatWitch + - ClothingOuterHoodieChaplain +# Shoes + +# Uniforms - type: loadout - id: LoadoutScienceHeadHatWitch1 + id: LoadoutChaplainJumpsuit category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutChaplainUniforms - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingHeadHatWitch1 + - ClothingUniformJumpsuitChaplain -# Mask - type: loadout - id: LoadoutScienceMaskPlague + id: LoadoutChaplainJumpskirt category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskScience + group: LoadoutChaplainUniforms - !type:CharacterJobRequirement jobs: - Chaplain items: - - ClothingMaskPlague + - ClothingUniformJumpskirtChaplain -# Equipment - type: loadout - id: LoadoutChaplainBible + id: LoadoutScienceUniformJumpsuitMonasticRobeDark category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChaplainEquipment + group: LoadoutUniformsScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - Bible + - ClothingUniformJumpsuitMonasticRobeDark - type: loadout - id: LoadoutChaplainStamp + id: LoadoutScienceUniformJumpsuitMonasticRobeLight category: JobsEpistemicsChaplain cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChaplainEquipment + group: LoadoutUniformsScience - !type:CharacterJobRequirement jobs: - Chaplain items: - - RubberStampChaplain + - ClothingUniformJumpsuitMonasticRobeLight diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml index 7b3c1d0f93d..de389aeba3c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml @@ -82,6 +82,22 @@ - ClothingHeadHoodMysta # Id +- type: loadout + id: LoadoutMystagogueNTPDA + category: JobsEpistemicsMystagogue + cost: 0 + exclusive: true + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobResearchDirector + min: 36000 # 10 hours + - !type:CharacterItemGroupRequirement + group: LoadoutChiefEngineerId + - !type:CharacterJobRequirement + jobs: + - ResearchDirector + items: + - RnDNTPDA # Neck - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml index dc279d238a4..b390adefdaa 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml @@ -20,26 +20,25 @@ # Mask # Outer - -# Shoes - -# Uniforms - type: loadout - id: LoadoutScienceUniformJumpskirtSenior - category: JobsEpistemicsMystic + id: LoadoutScienceOuterLabcoatSeniorResearcher + category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMysticUniforms + group: LoadoutMysticOuter - !type:CharacterJobRequirement jobs: - SeniorResearcher items: - - ClothingUniformJumpskirtSeniorResearcher + - ClothingOuterCoatLabSeniorResearcher + +# Shoes +# Uniforms - type: loadout - id: LoadoutScienceUniformJumpsuitSenior + id: LoadoutScienceUniformJumpskirtSenior category: JobsEpistemicsMystic cost: 0 exclusive: true @@ -50,19 +49,18 @@ jobs: - SeniorResearcher items: - - ClothingUniformJumpsuitSeniorResearcher + - ClothingUniformJumpskirtSeniorResearcher -# Outer - type: loadout - id: LoadoutScienceOuterLabcoatSeniorResearcher - category: JobsEpistemicsAAUncategorized + id: LoadoutScienceUniformJumpsuitSenior + category: JobsEpistemicsMystic cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMysticOuter + group: LoadoutMysticUniforms - !type:CharacterJobRequirement jobs: - SeniorResearcher items: - - ClothingOuterCoatLabSeniorResearcher + - ClothingUniformJumpsuitSeniorResearcher diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml index 5d9c2ee7cd1..9a05b17451c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml @@ -14,6 +14,22 @@ # Head # Id +- type: loadout + id: LoadoutLogisticsOfficerNTPDA + category: JobsLogisticsLogisticsOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobQuartermaster + min: 36000 # 10 hours + - !type:CharacterItemGroupRequirement + group: LoadoutQuartermasterId + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - QuartermasterNTPDA # Neck diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index 49191f2f453..9d26b537cc2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -1,39 +1,301 @@ # Chemist # Backpacks + +# Belt - type: loadout - id: LoadoutBackpackChemistry + id: LoadoutChemistBeltChemBag category: JobsMedicalChemist cost: 0 exclusive: true - items: - - ClothingBackpackChemistry requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutChemistBelt - !type:CharacterJobRequirement jobs: - Chemist - -# Belt + items: + - ChemBag # Ears # Equipment +- type: loadout + id: LoadoutMedicalItemHandLabeler + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - HandLabeler + +- type: loadout + id: LoadoutChemistPillCanisterKelotane + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterKelotane + +- type: loadout + id: LoadoutChemistPillCanisterTricordrazine + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterTricordrazine + +- type: loadout + id: LoadoutChemistPillCanisterHyronalin + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterHyronalin + +- type: loadout + id: LoadoutChemistPillCanisterBicaridine + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterBicaridine + +- type: loadout + id: LoadoutChemistPillCanisterDermaline + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterDermaline + +- type: loadout + id: LoadoutChemistPillCanisterDylovene + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterDylovene + +- type: loadout + id: LoadoutChemistPillCanisterDexalin + category: JobsMedicalChemist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterDexalin + +- type: loadout + id: LoadoutChemistPillCanisterSpaceDrugs + category: JobsMedicalChemist + cost: 2 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEquipment + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - PillCanisterSpaceDrugs # Eyes +- type: loadout + id: LoadoutMedicalEyesGlassesChemical + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEyes + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingEyesGlassesChemicalBudget + +- type: loadout + id: LoadoutMedicalEyesGlassesChemical + category: JobsMedicalChemist + cost: 2 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEyes + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingEyesGlassesChemical + +- type: loadout + id: LoadoutMedicalEyesGlassesChemist + category: JobsMedicalChemist + cost: 1 # These provide caustic armor, oddly enough. + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistEyes + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingEyesGlassesChemist # Gloves +- type: loadout + id: LoadoutMedicalHandsGlovesChemist + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistGloves + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingHandsGlovesChemist # Head # Id # Neck +- type: loadout + id: LoadoutMedicalNeckTieChem + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistNeck + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingNeckTieChem # Mask # Outer +- type: loadout + id: LoadoutMedicalOuterLabcoatChem + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistOuter + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingOuterCoatLabChem + +- type: loadout + id: LoadoutMedicalOuterApronChemist + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistOuter + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingOuterApronChemist # Shoes +- type: loadout + id: LoadoutMedicalShoesEnclosedChem + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistShoes + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingShoesEnclosedChem # Uniforms +- type: loadout + id: LoadoutMedicalUniformJumpsuitChemShirt + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistUniforms + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingUniformJumpsuitChemShirt + +- type: loadout + id: LoadoutMedicalUniformJumpsuitChemistry + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistUniforms + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingUniformJumpsuitChemistry + +- type: loadout + id: LoadoutMedicalUniformJumpskirtChemistry + category: JobsMedicalChemist + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistUniforms + - !type:CharacterJobRequirement + jobs: + - Chemist + items: + - ClothingUniformJumpskirtChemistry diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml index e75df7886a5..69b7bad8c20 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml @@ -12,25 +12,47 @@ # Gloves # Head +- type: loadout + id: LoadoutCommandCMOHatBeret + category: JobsMedicalChiefMedicalOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerHead + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingHeadHatBeretCmo # Id +- type: loadout + id: LoadoutChiefMedicalOfficerNTPDA + category: JobsMedicalChiefMedicalOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobChiefMedicalOfficer + min: 36000 # 10 hours + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerId + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - CMONTPDA # Neck - -# Mask - -# Outer - -# Shoes - -# Uniforms - - type: loadout id: LoadoutCommandCMONeckMantle category: JobsMedicalChiefMedicalOfficer cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerNeck - !type:CharacterJobRequirement jobs: - ChiefMedicalOfficer @@ -43,17 +65,38 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerNeck - !type:CharacterJobRequirement jobs: - ChiefMedicalOfficer items: - ClothingCloakCmo +- type: loadout + id: LoadoutChiefMedicalOfficerNeckMedalMedical + category: JobsMedicalChiefMedicalOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerNeck + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingNeckMedicalmedal + +# Mask + +# Outer - type: loadout id: LoadoutCommandCMOOuterWinter category: JobsMedicalChiefMedicalOfficer - cost: 1 + cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerOuter - !type:CharacterJobRequirement jobs: - ChiefMedicalOfficer @@ -65,31 +108,80 @@ category: JobsMedicalChiefMedicalOfficer cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerOuter - !type:CharacterJobRequirement jobs: - ChiefMedicalOfficer items: - ClothingOuterCoatLabCmo +# Shoes - type: loadout - id: LoadoutCommandCMOHatBeret + id: LoadoutCommandCMOShoesBootsWinter category: JobsMedicalChiefMedicalOfficer cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerShoes - !type:CharacterJobRequirement jobs: - ChiefMedicalOfficer items: - - ClothingHeadHatBeretCmo + - ClothingShoesBootsWinterChiefMedicalOfficer - type: loadout - id: LoadoutCommandCMOShoesBootsWinter - category: JobsMedicalChiefMedicalOfficer + id: LoadoutChiefMedicalOfficerShoesLaceup + category: JobsCommandCaptain cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerShoes - !type:CharacterJobRequirement jobs: - ChiefMedicalOfficer items: - - ClothingShoesBootsWinterChiefMedicalOfficer + - ClothingShoesBootsLaceup + +- type: loadout + id: LoadoutChiefMedicalOfficerShoesLeather + category: JobsCommandCaptain + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerShoes + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingShoesLeather + +# Uniforms +- type: loadout + id: LoadoutChiefMedicalOfficerJumpsuit + category: JobsMedicalChiefMedicalOfficer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerUniforms + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingUniformJumpsuitCMO + +- type: loadout + id: LoadoutChiefMedicalOfficerJumpskirt + category: JobsMedicalChiefMedicalOfficer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerUniforms + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingUniformJumpskirtCMO diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml index ff4d81d3467..5a9bd0010a7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml @@ -12,6 +12,19 @@ # Gloves # Head +- type: loadout + id: LoadoutMedicalHeadNurse + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalDoctorHead + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + items: + - ClothingHeadNurseHat # Id diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index 12d12a4a718..807233ba7ae 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -24,3 +24,30 @@ # Shoes # Uniforms +- type: loadout + id: LoadoutMedicalUniformParamedicJumpsuit + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutParamedicUniforms + - !type:CharacterJobRequirement + jobs: + - Paramedic + items: + - ClothingUniformJumpsuitParamedic + +- type: loadout + id: LoadoutMedicalUniformParamedicJumpskirt + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutParamedicUniforms + - !type:CharacterJobRequirement + jobs: + - Paramedic + items: + - ClothingUniformJumpskirtParamedic diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml index c68f5d5c7db..2e6c9fadc52 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml @@ -12,6 +12,19 @@ # Gloves # Head +- type: loadout + id: LoadoutMedicalHeadBeretSeniorPhysician + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorPhysicianHead + - !type:CharacterJobRequirement + jobs: + - SeniorPhysician + items: + - ClothingHeadHatBeretSeniorPhysician # Id @@ -31,19 +44,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutSeniorPhysicianUniforms - !type:CharacterJobRequirement jobs: - SeniorPhysician - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours items: - ClothingUniformJumpskirtSeniorPhysician @@ -54,18 +58,9 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutSeniorPhysicianUniforms - !type:CharacterJobRequirement jobs: - SeniorPhysician - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours items: - ClothingUniformJumpsuitSeniorPhysician diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml index d79828e3b7b..5a0af74ed1f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml @@ -9,7 +9,7 @@ - ClothingBackpackMedical requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutMedicalBackpacks - !type:CharacterDepartmentRequirement departments: - Medical @@ -23,7 +23,7 @@ - ClothingBackpackVirology requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutMedicalBackpacks - !type:CharacterDepartmentRequirement departments: - Medical @@ -37,7 +37,7 @@ - ClothingBackpackGenetics requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutMedicalBackpacks - !type:CharacterDepartmentRequirement departments: - Medical @@ -51,303 +51,246 @@ - ClothingBackpackSatchelMedical requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutMedicalBackpacks - !type:CharacterDepartmentRequirement departments: - Medical -# Belt - -# Ears - -# Equipment - -# Eyes - -# Gloves - type: loadout - id: LoadoutMedicalGlovesNitrile + id: LoadoutBackpackSatchelChemistry category: JobsMedicalAUncategorized cost: 0 exclusive: true + items: + - ClothingBackpackSatchelChemistry requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesMedical + group: LoadoutMedicalBackpacks - !type:CharacterDepartmentRequirement departments: - Medical - items: - - ClothingHandsGlovesNitrile - -# Head -# Id - -# Neck - type: loadout - id: LoadoutMedicalNeckStethoscope + id: LoadoutBackpackSatchelVirology category: JobsMedicalAUncategorized cost: 0 exclusive: true + items: + - ClothingBackpackSatchelVirology requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - ChiefMedicalOfficer - - MedicalIntern - items: - - ClothingNeckStethoscope - -# Mask + group: LoadoutMedicalBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical -# Outer - type: loadout - id: LoadoutMedicalOuterLabcoat + id: LoadoutBackpackSatchelGenetics category: JobsMedicalAUncategorized cost: 0 exclusive: true + items: + - ClothingBackpackSatchelGenetics requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - items: - - ClothingOuterCoatLab + group: LoadoutMedicalBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical - type: loadout - id: LoadoutMedicalOuterCybersunWindbreaker + id: LoadoutBackpackDuffelMedical category: JobsMedicalAUncategorized - cost: 3 + cost: 0 exclusive: true + items: + - ClothingBackpackDuffelMedical requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - items: - - ClothingOuterCoatCybersunWindbreaker - -# Shoes + group: LoadoutMedicalBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical -# Uniforms - type: loadout - id: LoadoutMedicalUniformScrubsBlue + id: LoadoutBackpackDuffelChemistry category: JobsMedicalAUncategorized cost: 0 exclusive: true + items: + - ClothingBackpackDuffelChemistry requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern - items: - - UniformScrubsColorBlue + group: LoadoutMedicalBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical - type: loadout - id: LoadoutMedicalUniformScrubsGreen + id: LoadoutBackpackDuffelVirology category: JobsMedicalAUncategorized cost: 0 exclusive: true + items: + - ClothingBackpackDuffelVirology requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern - items: - - UniformScrubsColorGreen + group: LoadoutMedicalBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical - type: loadout - id: LoadoutMedicalUniformScrubsPurple + id: LoadoutBackpackDuffelGenetics category: JobsMedicalAUncategorized cost: 0 exclusive: true + items: + - ClothingBackpackDuffelGenetics requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern - items: - - UniformScrubsColorPurple + group: LoadoutMedicalBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical - type: loadout - id: LoadoutMedicalUniformScrubsCyan + id: LoadoutBackpackMedicalDuffelSurgeryFilled category: JobsMedicalAUncategorized - cost: 0 + cost: 3 exclusive: true + items: + - ClothingBackpackDuffelSurgeryFilled requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern - items: - - UniformScrubsColorCyan + group: LoadoutMedicalBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical +# Belt - type: loadout - id: LoadoutMedicalUniformScrubsBlack + id: LoadoutMedicalBeltMedical category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalBelt + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - UniformScrubsColorBlack + - ClothingBeltMedical - type: loadout - id: LoadoutMedicalUniformScrubsPink + id: LoadoutMedicalBeltMedicalFilled category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalBelt + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - UniformScrubsColorPink + - ClothingBeltMedicalFilled - type: loadout - id: LoadoutMedicalUniformScrubsCybersun + id: LoadoutMedicalBeltMedicalAdvancedFilled category: JobsMedicalAUncategorized - cost: 1 + cost: 2 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic + group: LoadoutMedicalBelt + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - UniformScrubsColorCybersun + - ClothingBeltMedicalAdvancedFilled +# Ears + +# Equipment + +# Eyes - type: loadout - id: LoadoutMedicalOuterLabcoatChem + id: LoadoutMedicalEyesHudMedical category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterMedical - - !type:CharacterJobRequirement - jobs: - - Chemist - items: - - ClothingOuterCoatLabChem - -- type: loadout - id: LoadoutMedicalItemHandLabeler - category: JobsMedicalAUncategorized - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - Chemist + group: LoadoutMedicalEyes + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - HandLabeler + - ClothingEyesHudMedical - type: loadout - id: LoadoutMedicalUniformParamedicJumpsuit + id: LoadoutMedicalEyesEyepatchHudMedical category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - Paramedic + group: LoadoutMedicalEyes + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingUniformJumpsuitParamedic + - ClothingEyesEyepatchHudMedical - type: loadout - id: LoadoutMedicalUniformParamedicJumpskirt + id: LoadoutMedicalEyesHudMedicalPrescription category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - Paramedic + group: LoadoutMedicalEyes + - !type:CharacterDepartmentRequirement + departments: + - Medical + - !type:CharacterTraitRequirement + traits: + - Nearsighted items: - - ClothingUniformJumpskirtParamedic + - ClothingEyesPrescriptionMedHud +# Gloves - type: loadout - id: LoadoutMedicalHeadNurse + id: LoadoutMedicalGlovesNitrile category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor + group: LoadoutMedicalGloves + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingHeadNurseHat + - ClothingHandsGlovesNitrile - type: loadout - id: LoadoutMedicalHeadBeretSeniorPhysician + id: LoadoutMedicalGlovesLatex category: JobsMedicalAUncategorized - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - ChiefMedicalOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours + group: LoadoutMedicalGloves + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingHeadHatBeretSeniorPhysician + - ClothingHandsGlovesLatex +# Head - type: loadout id: LoadoutMedicalHeadSurgcapBlue category: JobsMedicalAUncategorized @@ -355,13 +298,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - ClothingHeadHatSurgcapBlue @@ -372,13 +312,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - ClothingHeadHatSurgcapPurple @@ -389,13 +326,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - ClothingHeadHatSurgcapGreen @@ -406,13 +340,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - ClothingHeadHatSurgcapCyan @@ -423,13 +354,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - ClothingHeadHatSurgcapBlack @@ -440,13 +368,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - ClothingHeadHatSurgcapPink @@ -457,13 +382,10 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - MedicalIntern + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - ClothingHeadHatSurgcapWhite @@ -474,7 +396,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical + group: LoadoutMedicalHead - !type:CharacterJobRequirement jobs: - MedicalDoctor @@ -483,172 +405,170 @@ items: - ClothingHeadHatSurgcapCybersun +# Id + +# Neck - type: loadout - id: LoadoutMedicalEyesHudMedical + id: LoadoutMedicalNeckStethoscope category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Paramedic - - ChiefMedicalOfficer - - MedicalIntern - - Brigmedic + group: LoadoutMedicalNeck + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingEyesHudMedical + - ClothingNeckStethoscope - type: loadout - id: LoadoutMedicalEyesEyepatchHudMedical + id: LoadoutMedicalBedsheetMedical category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Paramedic - - ChiefMedicalOfficer - - MedicalIntern - - Brigmedic + group: LoadoutMedicalNeck + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingEyesEyepatchHudMedical + - BedsheetMedical +# Mask + +# Outer - type: loadout - id: LoadoutMedicalEyesHudMedicalPrescription + id: LoadoutMedicalOuterLabcoat category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesMedical + group: LoadoutOuterMedical - !type:CharacterJobRequirement jobs: - MedicalDoctor - - Paramedic - - ChiefMedicalOfficer - - MedicalIntern - - Brigmedic - - !type:CharacterTraitRequirement - traits: - - Nearsighted + - Chemist items: - - ClothingEyesPrescriptionMedHud + - ClothingOuterCoatLab - type: loadout - id: LoadoutMedicalEyesGlassesChemical + id: LoadoutMedicalOuterCybersunWindbreaker category: JobsMedicalAUncategorized - cost: 0 + cost: 3 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesMedical + group: LoadoutOuterMedical - !type:CharacterJobRequirement jobs: - - Chemist + - MedicalDoctor + - Chemist + - Paramedic items: - - ClothingEyesGlassesChemical + - ClothingOuterCoatCybersunWindbreaker +# Shoes + +# Uniforms - type: loadout - id: LoadoutMedicalBedsheetMedical + id: LoadoutMedicalUniformScrubsBlue category: JobsMedicalAUncategorized - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckMedical + group: LoadoutUniformsMedical - !type:CharacterDepartmentRequirement departments: - Medical items: - - BedsheetMedical + - UniformScrubsColorBlue -# Chemist PPE gear - type: loadout - id: LoadoutMedicalUniformJumpsuitChemShirt + id: LoadoutMedicalUniformScrubsGreen category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - Chemist + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingUniformJumpsuitChemShirt + - UniformScrubsColorGreen - type: loadout - id: LoadoutMedicalNeckTieChem + id: LoadoutMedicalUniformScrubsPurple category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckMedical - - !type:CharacterJobRequirement - jobs: - - Chemist + group: LoadoutUniformsMedical + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingNeckTieChem + - UniformScrubsColorPurple - type: loadout - id: LoadoutMedicalShoesEnclosedChem + id: LoadoutMedicalUniformScrubsCyan category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesMedical - - !type:CharacterJobRequirement - jobs: - - Chemist + group: LoadoutUniformsMedical + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingShoesEnclosedChem + - UniformScrubsColorCyan - type: loadout - id: LoadoutMedicalOuterApronChemist + id: LoadoutMedicalUniformScrubsBlack category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterMedical - - !type:CharacterJobRequirement - jobs: - - Chemist + group: LoadoutUniformsMedical + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingOuterApronChemist + - UniformScrubsColorBlack - type: loadout - id: LoadoutMedicalEyesGlassesChemist + id: LoadoutMedicalUniformScrubsPink category: JobsMedicalAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesMedical - - !type:CharacterJobRequirement - jobs: - - Chemist + group: LoadoutUniformsMedical + - !type:CharacterDepartmentRequirement + departments: + - Medical items: - - ClothingEyesGlassesChemist + - UniformScrubsColorPink - type: loadout - id: LoadoutMedicalHandsGlovesChemist + id: LoadoutMedicalUniformScrubsCybersun category: JobsMedicalAUncategorized - cost: 0 + cost: 1 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesMedical + group: LoadoutUniformsMedical - !type:CharacterJobRequirement - jobs: - - Chemist + jobs: + - MedicalDoctor + - Chemist + - Paramedic items: - - ClothingHandsGlovesChemist + - UniformScrubsColorCybersun diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml index 6e6fefe3576..12285fbc47b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml @@ -126,6 +126,7 @@ - HeadOfSecurity items: - ClothingHeadHatHoshat + # Id # Neck diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 66466352cbe..e9d7f3f14e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -27,8 +27,6 @@ shoes: ClothingShoesColorWhite id: ChemistryPDA ears: ClothingHeadsetMedical - belt: ChemBag - # the purple glasses? innerClothingSkirt: ClothingUniformJumpskirtChemistry satchel: ClothingBackpackSatchelChemistryFilled duffelbag: ClothingBackpackDuffelChemistryFilled From 4fe5ce08c69b9658d1f5f2bd2625c3bd55d632fc Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 17 Nov 2024 17:29:06 -0500 Subject: [PATCH 15/27] It just keeps going. --- .../Locale/en-US/loadouts/categories.ftl | 1 + .../Loadouts/Categories/categories.yml | 4 ++ .../Jobs/Medical/chiefMedicalOfficer.yml | 27 ++++++++ .../Loadouts/Jobs/Medical/medicalDoctor.yml | 66 +++++++++++++++++++ .../Loadouts/Jobs/Medical/medicalIntern.yml | 27 ++++++++ .../Loadouts/Jobs/Medical/psychologist.yml | 26 ++++++++ .../Loadouts/Jobs/Medical/seniorPhysician.yml | 41 ++++++++++++ .../Loadouts/Jobs/Medical/uncategorized.yml | 41 ------------ .../Loadouts/Jobs/Security/detective.yml | 8 +-- .../Jobs/Medical/chief_medical_officer.yml | 1 - .../Roles/Jobs/Medical/medical_doctor.yml | 1 - .../Roles/Jobs/Medical/medical_intern.yml | 1 - 12 files changed, 196 insertions(+), 48 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl index 66e7dd5b76c..782932ae634 100644 --- a/Resources/Locale/en-US/loadouts/categories.ftl +++ b/Resources/Locale/en-US/loadouts/categories.ftl @@ -55,6 +55,7 @@ loadout-category-JobsMedicalChiefMedicalOfficer = Chief Medical Officer loadout-category-JobsMedicalMedicalDoctor = Medical Doctor loadout-category-JobsMedicalMedicalIntern = Medical Intern loadout-category-JobsMedicalParamedic = Paramedic +loadout-category-JobsMedicalPsychologist = Psychologist loadout-category-JobsMedicalSeniorPhysician = Senior Physician # Security diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml index 5d40027f191..48de355a517 100644 --- a/Resources/Prototypes/Loadouts/Categories/categories.yml +++ b/Resources/Prototypes/Loadouts/Categories/categories.yml @@ -166,6 +166,7 @@ - JobsMedicalMedicalDoctor - JobsMedicalMedicalIntern - JobsMedicalParamedic + - JobsMedicalPsychologist - JobsMedicalSeniorPhysician - type: loadoutCategory @@ -186,6 +187,9 @@ - type: loadoutCategory id: JobsMedicalParamedic +- type: loadoutCategory + id: JobsMedicalPsychologist + - type: loadoutCategory id: JobsMedicalSeniorPhysician diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml index 69b7bad8c20..569aea8422b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml @@ -2,6 +2,33 @@ # Backpacks # Belt +- type: loadout + id: LoadoutChiefMedicalOfficerBeltMedical + category: JobsMedicalChiefMedicalOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerBelt + - !type:CharacterJobRequirement + Jobs: + - ChiefMedicalOfficer + items: + - ClothingBeltMedical + +- type: loadout + id: LoadoutChiefMedicalOfficerBeltMedicalAdvancedFilled + category: JobsMedicalChiefMedicalOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerBelt + - !type:CharacterJobRequirement + Jobs: + - ChiefMedicalOfficer + items: + - ClothingBeltMedicalAdvancedFilled # Ears diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml index 5a9bd0010a7..bfce53a2b13 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml @@ -2,6 +2,47 @@ # Backpacks # Belt +- type: loadout + id: LoadoutMedicalDoctorBeltMedical + category: JobsMedicalMedicalDoctor + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalDoctorBelt + - !type:CharacterJobRequirement + Jobs: + - MedicalDoctor + items: + - ClothingBeltMedical + +- type: loadout + id: LoadoutMedicalBeltMedicalFilled + category: JobsMedicalMedicalDoctor + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalDoctorBelt + - !type:CharacterJobRequirement + Jobs: + - MedicalDoctor + items: + - ClothingBeltMedicalFilled + +- type: loadout + id: LoadoutMedicalBeltMedicalAdvancedFilled + category: JobsMedicalMedicalDoctor + cost: 2 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalDoctorBelt + - !type:CharacterJobRequirement + Jobs: + - MedicalDoctor + items: + - ClothingBeltMedicalAdvancedFilled # Ears @@ -37,3 +78,28 @@ # Shoes # Uniforms +- type: loadout + id: LoadoutMedicalDoctorJumpsuit + category: JobsMedicalMedicalDoctor + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalDoctorUniforms + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + items: + - ClothingUniformJumpsuitMedicalDoctor + +- type: loadout + id: LoadoutMedicalDoctorJumpskirt + category: JobsMedicalMedicalDoctor + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalDoctorUniforms + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + items: + - ClothingUniformJumpskirtMedicalDoctor diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml index 05234ca1ead..c5eed74e9e8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml @@ -2,6 +2,33 @@ # Backpacks # Belt +- type: loadout + id: LoadoutMedicalInternBeltMedical + category: JobsMedicalMedicalIntern + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalInternBelt + - !type:CharacterJobRequirement + Jobs: + - MedicalIntern + items: + - ClothingBeltMedical + +- type: loadout + id: LoadoutMedicalInternBeltMedicalFilled + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalInternBelt + - !type:CharacterJobRequirement + Jobs: + - MedicalIntern + items: + - ClothingBeltMedicalFilled # Ears diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml new file mode 100644 index 00000000000..685a22ff8c3 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml @@ -0,0 +1,26 @@ +# Psychologist +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml index 2e6c9fadc52..6ca0188c248 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml @@ -6,6 +6,47 @@ # Ears # Equipment +- type: loadout + id: LoadoutSeniorPhysicianBeltMedical + category: JobsMedicalSeniorPhysician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorPhysicianBelt + - !type:CharacterJobRequirement + Jobs: + - MedicalDoctor + items: + - ClothingBeltMedical + +- type: loadout + id: LoadoutSeniorPhysicianBeltMedicalFilled + category: JobsMedicalSeniorPhysician + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalDoctorBelt + - !type:CharacterJobRequirement + Jobs: + - SeniorPhysician + items: + - ClothingBeltMedicalFilled + +- type: loadout + id: LoadoutSeniorPhysicianBeltMedicalAdvancedFilled + category: JobsMedicalSeniorPhysician + cost: 1 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSeniorPhysicianBelt + - !type:CharacterJobRequirement + Jobs: + - SeniorPhysician + items: + - ClothingBeltMedicalAdvancedFilled # Eyes diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml index 5a0af74ed1f..3e495850bcd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml @@ -169,47 +169,6 @@ - Medical # Belt -- type: loadout - id: LoadoutMedicalBeltMedical - category: JobsMedicalAUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMedicalBelt - - !type:CharacterDepartmentRequirement - departments: - - Medical - items: - - ClothingBeltMedical - -- type: loadout - id: LoadoutMedicalBeltMedicalFilled - category: JobsMedicalAUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMedicalBelt - - !type:CharacterDepartmentRequirement - departments: - - Medical - items: - - ClothingBeltMedicalFilled - -- type: loadout - id: LoadoutMedicalBeltMedicalAdvancedFilled - category: JobsMedicalAUncategorized - cost: 2 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMedicalBelt - - !type:CharacterDepartmentRequirement - departments: - - Medical - items: - - ClothingBeltMedicalAdvancedFilled # Ears diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index 4d358a8e7f1..e68b63a57a1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -22,12 +22,12 @@ # Outer - type: loadout id: LoadoutClothingOuterCoatDetective - category: JobsSecurityAUncategorized + category: JobsSecurityDetective cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutDetectiveOuter - !type:CharacterJobRequirement jobs: - Detective @@ -36,12 +36,12 @@ - type: loadout id: LoadoutOuterVestDetective - category: JobsSecurityAUncategorized + category: JobsSecurityDetective cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutDetectiveOuter - !type:CharacterJobRequirement jobs: - Detective diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 756a651fb0f..a7c3f189835 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -63,7 +63,6 @@ shoes: ClothingShoesColorBrown id: CMOPDA ears: ClothingHeadsetCMO - belt: ClothingBeltMedicalFilled innerClothingSkirt: ClothingUniformJumpskirtCMO satchel: ClothingBackpackSatchelCMOFilled duffelbag: ClothingBackpackDuffelCMOFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 7cdbbed8f08..81c56a677fe 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -31,7 +31,6 @@ shoes: ClothingShoesColorWhite id: MedicalPDA ears: ClothingHeadsetMedical - belt: ClothingBeltMedicalFilled innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 67ede6810f8..3d3ba15990d 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -30,7 +30,6 @@ shoes: ClothingShoesColorWhite id: MedicalInternPDA ears: ClothingHeadsetMedical - belt: ClothingBeltMedicalFilled pocket2: BookMedicalReferenceBook # innerClothingSkirt: ClothingUniformJumpskirtColorWhite # DeltaV satchel: ClothingBackpackSatchelMedicalFilled From 606889c3ef9cc5a358a47bc033d2dbc20d129f3b Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 17 Nov 2024 18:54:48 -0500 Subject: [PATCH 16/27] It goes ever onward. --- .../Jobs/Command/aaaaaaaaaaa | 64 ++++++++++ .../Jobs/Command/captain.yml | 17 ++- .../Jobs/Command/commandUncategorized.yml | 77 +++++++++++ .../Jobs/Command/headOfPersonnel.yml | 27 +++- .../Jobs/Command/uncategorized.yml | 12 -- .../Engineering/atmosphericTechnician.yml | 27 +++- .../Jobs/Engineering/chiefEngineer.yml | 32 ++++- ...rized.yml => engineeringUncategorized.yml} | 0 .../Jobs/Engineering/seniorEngineer.yml | 50 ++++++++ .../Jobs/Engineering/stationEngineer.yml | 60 +++++++++ .../Jobs/Engineering/technicalAssistant.yml | 64 ++++++++++ .../Prototypes/Loadouts/Generic/backpacks.yml | 14 -- .../Loadouts/Generic/duffelbags.yml | 42 ------ .../Prototypes/Loadouts/Generic/satchels.yml | 42 ------ .../Jobs/Logistics/salvageSpecialist.yml | 30 ++++- .../Loadouts/Jobs/Medical/psychologist.yml | 120 ++++++++++++++++++ .../Loadouts/Jobs/Security/corpsman.yml | 32 ++++- .../Loadouts/Jobs/Security/headOfSecurity.yml | 16 +++ .../Loadouts/Jobs/Service/clown.yml | 41 ++++++ .../Roles/Jobs/Medical/paramedic.yml | 10 +- 20 files changed, 655 insertions(+), 122 deletions(-) create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml delete mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml rename Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/{uncategorized.yml => engineeringUncategorized.yml} (100%) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa new file mode 100644 index 00000000000..c8febb71cff --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa @@ -0,0 +1,64 @@ +- type: characterItemGroup + id: LoadoutCommandBackpacks + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandBelt + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandEars + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandEquipment + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandEyes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandGloves + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandHead + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandId + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandNeck + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandMask + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandOuter + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandShoes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandUniforms + maxItems: 1 + items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml index abb45c77a8b..c3828ab269c 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml @@ -22,6 +22,16 @@ - type: loadout id: LoadoutCaptainSwordSheath +- type: characterItemGroup + id: LoadoutCaptainEars + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCaptainEquipment + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutCaptainTrinkets maxItems: 3 @@ -71,6 +81,11 @@ - type: loadout id: LoadoutCommandCapHatBeret +- type: characterItemGroup + id: LoadoutCaptainId + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutCaptainNeck maxItems: 1 @@ -114,7 +129,7 @@ id: LoadoutCaptainShoesCombat - type: characterItemGroup - id: LoadoutCaptainUniform + id: LoadoutCaptainUniforms maxItems: 1 items: - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml new file mode 100644 index 00000000000..978cafe1bb6 --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml @@ -0,0 +1,77 @@ +- type: characterItemGroup + id: LoadoutCommandBackpacks + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandBelt + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandEars + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandEquipment + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandSelfDefense + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandTelescopicBaton + - type: loadout + id: LoadoutCommandDisabler + - type: loadout + id: LoadoutCommandStunBaton + - type: loadout + id: LoadoutCommandFlash + +- type: characterItemGroup + id: LoadoutCommandEyes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandGloves + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandHead + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandId + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandNeck + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandMask + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandOuter + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandShoes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutCommandUniforms + maxItems: 1 + items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml index 79f17606572..0b2bab129f2 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml @@ -20,6 +20,16 @@ - type: loadout id: LoadoutHeadOfPersonnelBeltClipboard +- type: characterItemGroup + id: LoadoutHeadOfPersonnelEars + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutHeadOfPersonnelEquipment + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutHeadOfPersonnelTrinkets maxItems: 3 @@ -29,6 +39,11 @@ - type: loadout id: LoadoutHeadOfPersonnelBookIanDossier +- type: characterItemGroup + id: LoadoutHeadOfPersonnelEyes + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutHeadOfPersonnelGloves maxItems: 1 @@ -45,6 +60,11 @@ - type: loadout id: LoadoutCommandHOPHatCap +- type: characterItemGroup + id: LoadoutHeadOfPersonnelId + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutHeadOfPersonnelNeck maxItems: 1 @@ -58,6 +78,11 @@ - type: loadout id: LoadoutHeadOfPersonnelNeckGoldMedal +- type: characterItemGroup + id: LoadoutHeadOfPersonnelMask + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutHeadOfPersonnelOuter maxItems: 1 @@ -83,7 +108,7 @@ id: LoadoutCommandHOPShoesBootsWinter - type: characterItemGroup - id: LoadoutHeadOfPersonnelUniform + id: LoadoutHeadOfPersonnelUniforms maxItems: 1 items: - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml deleted file mode 100644 index bad1faf2f8b..00000000000 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/uncategorized.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: characterItemGroup - id: LoadoutCommandSelfDefense - maxItems: 1 - items: - - type: loadout - id: LoadoutCommandTelescopicBaton - - type: loadout - id: LoadoutCommandDisabler - - type: loadout - id: LoadoutCommandStunBaton - - type: loadout - id: LoadoutCommandFlash diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml index d861fd44192..5cfe6d392ba 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml @@ -18,6 +18,11 @@ - type: loadout id: LoadoutAtmosphericTechnicianBeltUtilityAtmos +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianEars + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutAtmosphericTechnicianEquipment maxItems: 1 @@ -29,6 +34,16 @@ - type: loadout id: LoadoutAtmosphericTechnicianEquipmentRCD +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianEyes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianGloves + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutAtmosphericTechnicianHead maxItems: 1 @@ -36,6 +51,16 @@ - type: loadout id: LoadoutAtmosphericTechnicianChickenhead +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianId + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutAtmosphericTechnicianNeck + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutAtmosphericTechnicianMask maxItems: 1 @@ -60,7 +85,7 @@ id: LoadoutAtmosphericTechnicianShoesWork - type: characterItemGroup - id: LoadoutAtmosphericTechnicianUniform + id: LoadoutAtmosphericTechnicianUniforms maxItems: 1 items: - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml index 03c6e54c389..215f77f153d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml @@ -18,6 +18,11 @@ - type: loadout id: LoadoutChiefEngineerBeltFilled +- type: characterItemGroup + id: LoadoutChiefEngineerEars + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutChiefEngineerEquipment maxItems: 2 @@ -31,6 +36,26 @@ - type: loadout id: LoadoutChiefEngineerEquipmentRCDAmmoSpare +- type: characterItemGroup + id: LoadoutChiefEngineerEyes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutChiefEngineerGloves + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutChiefEngineerHead + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutChiefEngineerId + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutChiefEngineerNeck maxItems: 1 @@ -42,6 +67,11 @@ - type: loadout id: LoadoutEngineeringChiefEngineerNeckEngineerMedal +- type: characterItemGroup + id: LoadoutChiefEngineerMask + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutChiefEngineerOuter maxItems: 1 @@ -57,7 +87,7 @@ id: LoadoutChiefEngineerShoesBootsWinter - type: characterItemGroup - id: LoadoutChiefEngineerUniform + id: LoadoutChiefEngineerUniforms maxItems: 1 items: - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml index abc6700010c..13e431fe9bf 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml @@ -1,3 +1,8 @@ +- type: characterItemGroup + id: LoadoutSeniorEngineerBackpacks + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutSeniorEngineerBelt maxItems: 1 @@ -9,6 +14,11 @@ - type: loadout id: LoadoutSeniorEngineerBeltUtilityAtmos +- type: characterItemGroup + id: LoadoutSeniorEngineerEars + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutSeniorEngineerEquipment maxItems: 2 @@ -20,6 +30,46 @@ - type: loadout id: LoadoutSeniorEngineerEquipmentRCD +- type: characterItemGroup + id: LoadoutSeniorEngineerEyes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutSeniorEngineerGloves + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutSeniorEngineerHead + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutSeniorEngineerId + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutSeniorEngineerNeck + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutSeniorEngineerMask + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutSeniorEngineerOuter + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutSeniorEngineerShoes + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutSeniorEngineerUniforms maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml index 4fb48f1ff59..14ea3ff0837 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml @@ -1,3 +1,18 @@ +- type: characterItemGroup + id: LoadoutStationEngineerBackpacks + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerBelt + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerEars + maxItems: 1 + items: + - type: characterItemGroup id: LoadoutStationEngineerEquipment maxItems: 2 @@ -6,3 +21,48 @@ id: LoadoutStationEngineerEquipmentBoxInflatable - type: loadout id: LoadoutStationEngineerEquipmentRCD + +- type: characterItemGroup + id: LoadoutStationEngineerEyes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerGloves + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerHead + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerId + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerNeck + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerMask + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerOuter + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerShoes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutStationEngineerUniforms + maxItems: 1 + items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml index e69de29bb2d..74c70b573d0 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml @@ -0,0 +1,64 @@ +- type: characterItemGroup + id: LoadoutTechnicalAssistantBackpacks + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantBelt + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantEars + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantEquipment + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantEyes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantGloves + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantHead + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantId + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantNeck + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantMask + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantOuter + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantShoes + maxItems: 1 + items: + +- type: characterItemGroup + id: LoadoutTechnicalAssistantUniforms + maxItems: 1 + items: diff --git a/Resources/Prototypes/Loadouts/Generic/backpacks.yml b/Resources/Prototypes/Loadouts/Generic/backpacks.yml index 5060fbfc8dd..8dc72a08827 100644 --- a/Resources/Prototypes/Loadouts/Generic/backpacks.yml +++ b/Resources/Prototypes/Loadouts/Generic/backpacks.yml @@ -9,20 +9,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutBackpacks -- type: loadout - id: LoadoutBackpackClown - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackClown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Clown - - type: loadout id: LoadoutBackpackMime category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml index 37cfafbb877..0dd58c65406 100644 --- a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml @@ -9,20 +9,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutBackpacks -- type: loadout - id: LoadoutBackpackDuffelClown - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelClown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Clown - - type: loadout id: LoadoutBackpackDuffelSecurity category: Backpacks @@ -37,20 +23,6 @@ departments: - Security -- type: loadout - id: LoadoutBackpackDuffelBrigmedic - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelBrigmedic - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Brigmedic - - type: loadout id: LoadoutBackpackDuffelMime category: Backpacks @@ -120,17 +92,3 @@ - !type:CharacterDepartmentRequirement departments: - Logistics - -- type: loadout - id: LoadoutBackpackDuffelSalvage - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelSalvage - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Logistics diff --git a/Resources/Prototypes/Loadouts/Generic/satchels.yml b/Resources/Prototypes/Loadouts/Generic/satchels.yml index eec78f1c570..ca6ea8cd99d 100644 --- a/Resources/Prototypes/Loadouts/Generic/satchels.yml +++ b/Resources/Prototypes/Loadouts/Generic/satchels.yml @@ -22,20 +22,6 @@ jobs: - Prisoner -- type: loadout - id: LoadoutBackpackSatchelClown - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelClown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Clown - - type: loadout id: LoadoutBackpackSatchelSecurity category: Backpacks @@ -50,20 +36,6 @@ departments: - Security -- type: loadout - id: LoadoutBackpackSatchelBrigmedic - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelBrigmedic - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterJobRequirement - jobs: - - Brigmedic - - type: loadout id: LoadoutBackpackSatchelMime category: Backpacks @@ -133,17 +105,3 @@ - !type:CharacterDepartmentRequirement departments: - Logistics - -- type: loadout - id: LoadoutBackpackSatchelSalvage - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelSalvage - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Logistics diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index a9be43fde75..f81f60817fa 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -1,7 +1,7 @@ # Salvage Specialist # Backpacks - type: loadout - id: LoadoutBackpackSalvage + id: LoadoutSalvageBackpackBackpack category: JobsLogisticsSalvageSpecialist cost: 0 exclusive: true @@ -14,6 +14,34 @@ departments: - Logistics +- type: loadout + id: LoadoutSalvageBackpackSatchel + category: JobsLogisticsSalvageSpecialist + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelSalvage + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Logistics + +- type: loadout + id: LoadoutSalvageBackpackDuffel + category: JobsLogisticsSalvageSpecialist + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelSalvage + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSalvageSpecialistBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Logistics + # Belt # Ears diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml index 685a22ff8c3..9414b687dac 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/psychologist.yml @@ -1,11 +1,106 @@ # Psychologist # Backpacks +- type: loadout + id: LoadoutPsychologistBackpackBackpack + category: JobsMedicalPsychologist + cost: 0 + exclusive: true + items: + - ClothingBackpackPsychologistFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical + +- type: loadout + id: LoadoutPsychologistBackpackSatchel + category: JobsMedicalPsychologist + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelPsychologistFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical + +- type: loadout + id: LoadoutPsychologistBackpackDuffel + category: JobsMedicalPsychologist + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelPsychologistFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Medical # Belt # Ears # Equipment +# The Psychologist chooses freely from drugs that change the mind. +# If we ever get more mind-affecting drugs, add them here. +- type: loadout + id: LoadoutPsychologistPillCanisterSpaceDrugs + category: JobsMedicalPsychologist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistEquipment + - !type:CharacterJobRequirement + jobs: + - Psychologist + items: + - PillCanisterSpaceDrugs + +- type: loadout + id: LoadoutPsychologistPillCanisterPax + category: JobsMedicalPsychologist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistEquipment + - !type:CharacterJobRequirement + jobs: + - Psychologist + items: + - PillCanisterPax + +- type: loadout + id: LoadoutPsychologistPillCanisterCryptobiolin + category: JobsMedicalPsychologist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistEquipment + - !type:CharacterJobRequirement + jobs: + - Psychologist + items: + - PillCanisterCryptobiolin + +# Yes this one is a little dangerous. Keeps the job interesting. :) +- type: loadout + id: LoadoutPsychologistPillCanisterChloralHydrate + category: JobsMedicalPsychologist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistEquipment + - !type:CharacterJobRequirement + jobs: + - Psychologist + items: + - PillCanisterChloralHydrate # Eyes @@ -24,3 +119,28 @@ # Shoes # Uniforms +- type: loadout + id: LoadoutPsychologistJumpsuit + category: JobsMedicalPsychologist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistUniforms + - !type:CharacterJobRequirement + jobs: + - Psychologist + items: + - ClothingUniformJumpsuitPsychologist + +- type: loadout + id: LoadoutPsychologistJumpskirt + category: JobsMedicalPsychologist + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPsychologistUniforms + - !type:CharacterJobRequirement + jobs: + - Psychologist + items: + - ClothingUniformJumpsuitPsychologist diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml index 320f38f7857..b4adbcaee62 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml @@ -1,12 +1,40 @@ # Corpsman # Backpacks - type: loadout - id: LoadoutBackpackCorpsman + id: LoadoutCorpsmanBackpackBackpack category: JobsSecurityCorpsman cost: 0 exclusive: true items: - - ClothingBackpackBrigmedic + - ClothingBackpackBrigmedicFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - Brigmedic + +- type: loadout + id: LoadoutCorpsmanBackpackSatchel + category: Backpacks + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelBrigmedicFilled + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - Brigmedic + +- type: loadout + id: LoadoutCorpsmanBackpackDuffel + category: Backpacks + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelBrigmedicFilled requirements: - !type:CharacterItemGroupRequirement group: LoadoutBackpacks diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml index 12285fbc47b..415e56af0ea 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml @@ -128,6 +128,22 @@ - ClothingHeadHatHoshat # Id +- type: loadout + id: LoadoutHeadOfSecurityNTPDA + category: JobsSecurityHeadOfSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobHeadOfSecurity + min: 36000 # 10 hours + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityId + - !type:CharacterJobRequirement + jobs: + - HeadOfSecurity + items: + - HoSNTPDA # Neck - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml index ad3507dcb44..aaf31235416 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml @@ -1,5 +1,46 @@ # Clown # Backpacks +- type: loadout + id: LoadoutBackpackClown + category: JobsServiceClown + cost: 0 + exclusive: true + items: + - ClothingBackpackClown + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutClownBackpacks + - !type:CharacterJobRequirement + jobs: + - Clown + +- type: loadout + id: LoadoutBackpackSatchelClown + category: JobsServiceClown + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelClown + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutClownBackpacks + - !type:CharacterJobRequirement + jobs: + - Clown + +- type: loadout + id: LoadoutBackpackDuffelClown + category: JobsServiceClown + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelClown + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutClownBackpacks + - !type:CharacterJobRequirement + jobs: + - Clown # Belt diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index da0acc468b0..9114d21966f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -34,13 +34,13 @@ id: ParamedicGear equipment: jumpsuit: ClothingUniformJumpsuitParamedic - back: ClothingBackpackParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/backpack.yml + back: ClothingBackpackParamedicFilledDV shoes: ClothingShoesColorBlue id: ParamedicPDA ears: ClothingHeadsetMedical belt: ClothingBeltMedicalEMTFilled - pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn - pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn + pocket1: HandheldGPSBasic + pocket2: HandheldCrewMonitor innerClothingSkirt: ClothingUniformJumpskirtParamedic - satchel: ClothingBackpackSatchelParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/satchel.yml - duffelbag: ClothingBackpackDuffelParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/duffelbag.yml + satchel: ClothingBackpackSatchelParamedicFilledDV + duffelbag: ClothingBackpackDuffelParamedicFilledDV From 6100b05008f39696cca7c5e13878529930d35e54 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 17 Nov 2024 19:01:22 -0500 Subject: [PATCH 17/27] aaaaaaaaa --- .../CharacterItemGroups/{ => Generic}/backpackGroups.yml | 0 .../Prototypes/CharacterItemGroups/{ => Generic}/eyesGroup.yml | 0 .../Prototypes/CharacterItemGroups/{ => Generic}/gloveGroup.yml | 0 .../Prototypes/CharacterItemGroups/{ => Generic}/headGroup.yml | 0 .../Prototypes/CharacterItemGroups/{ => Generic}/itemGroups.yml | 0 .../CharacterItemGroups/{ => Generic}/languageGroups.yml | 0 .../Prototypes/CharacterItemGroups/{ => Generic}/maskGroup.yml | 0 .../CharacterItemGroups/{ => Generic}/miscItemGroups.yml | 0 .../Prototypes/CharacterItemGroups/{ => Generic}/neckGroup.yml | 0 .../CharacterItemGroups/{ => Generic}/outerwearGroup.yml | 0 .../Prototypes/CharacterItemGroups/{ => Generic}/shoeGroup.yml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/backpackGroups.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/eyesGroup.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/gloveGroup.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/headGroup.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/itemGroups.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/languageGroups.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/maskGroup.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/miscItemGroups.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/neckGroup.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/outerwearGroup.yml (100%) rename Resources/Prototypes/CharacterItemGroups/{ => Generic}/shoeGroup.yml (100%) diff --git a/Resources/Prototypes/CharacterItemGroups/backpackGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/backpackGroups.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/backpackGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/backpackGroups.yml diff --git a/Resources/Prototypes/CharacterItemGroups/eyesGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/eyesGroup.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/eyesGroup.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/eyesGroup.yml diff --git a/Resources/Prototypes/CharacterItemGroups/gloveGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/gloveGroup.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml diff --git a/Resources/Prototypes/CharacterItemGroups/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/headGroup.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml diff --git a/Resources/Prototypes/CharacterItemGroups/itemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/itemGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml diff --git a/Resources/Prototypes/CharacterItemGroups/languageGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/languageGroups.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/languageGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/languageGroups.yml diff --git a/Resources/Prototypes/CharacterItemGroups/maskGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/maskGroup.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml diff --git a/Resources/Prototypes/CharacterItemGroups/miscItemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/miscItemGroups.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml diff --git a/Resources/Prototypes/CharacterItemGroups/neckGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/neckGroup.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml diff --git a/Resources/Prototypes/CharacterItemGroups/outerwearGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/outerwearGroup.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/outerwearGroup.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/outerwearGroup.yml diff --git a/Resources/Prototypes/CharacterItemGroups/shoeGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml similarity index 100% rename from Resources/Prototypes/CharacterItemGroups/shoeGroup.yml rename to Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml From 5616759fea3f6ff4a302fa65a2c41e8a27735db6 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 17 Nov 2024 19:06:11 -0500 Subject: [PATCH 18/27] Alright that's it for the night. --- .../Loadouts/Generic/duffelbags.yml | 14 --------- .../Prototypes/Loadouts/Generic/satchels.yml | 14 --------- .../Loadouts/Jobs/Logistics/uncategorized.yml | 30 ++++++++++++++++++- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml index 0dd58c65406..8e7102d6f1b 100644 --- a/Resources/Prototypes/Loadouts/Generic/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/Generic/duffelbags.yml @@ -78,17 +78,3 @@ - !type:CharacterDepartmentRequirement departments: - Epistemics - -- type: loadout - id: LoadoutBackpackDuffelCargo - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelCargo - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Logistics diff --git a/Resources/Prototypes/Loadouts/Generic/satchels.yml b/Resources/Prototypes/Loadouts/Generic/satchels.yml index ca6ea8cd99d..dbb9c1a2040 100644 --- a/Resources/Prototypes/Loadouts/Generic/satchels.yml +++ b/Resources/Prototypes/Loadouts/Generic/satchels.yml @@ -91,17 +91,3 @@ - !type:CharacterDepartmentRequirement departments: - Epistemics - -- type: loadout - id: LoadoutBackpackSatchelCargo - category: Backpacks - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelCargo - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Logistics diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml index 95208865714..fe6d664e287 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/uncategorized.yml @@ -9,7 +9,35 @@ - ClothingBackpackCargo requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutLogisticsBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Logistics + +- type: loadout + id: LoadoutBackpackSatchelCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelCargo + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsBackpacks + - !type:CharacterDepartmentRequirement + departments: + - Logistics + +- type: loadout + id: LoadoutBackpackDuffelCargo + category: JobsLogisticsAUncategorized + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelCargo + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsBackpacks - !type:CharacterDepartmentRequirement departments: - Logistics From 3273dc3ff0516caa9723126267b30114700f01df Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 11:40:19 -0500 Subject: [PATCH 19/27] MY FINGERS HURT --- .../Locale/en-US/loadouts/itemgroups.ftl | 763 ++++++++++++++++-- .../Jobs/Command/aaaaaaaaaaa | 64 -- .../Jobs/Command/captain.yml | 8 +- .../Jobs/Command/commandUncategorized.yml | 105 +-- .../Jobs/Command/headOfPersonnel.yml | 40 +- .../Engineering/atmosphericTechnician.yml | 40 +- .../Jobs/Engineering/chiefEngineer.yml | 48 +- .../Engineering/engineeringUncategorized.yml | 64 +- .../Jobs/Engineering/seniorEngineer.yml | 80 +- .../Jobs/Engineering/stationEngineer.yml | 96 +-- .../Jobs/Engineering/technicalAssistant.yml | 104 +-- .../Jobs/Epistemics/acolyte.yml | 64 ++ .../Jobs/Epistemics/cataloger.yml | 64 +- .../Jobs/Epistemics/chaplain.yml | 71 +- .../Jobs/Epistemics/golemancer.yml | 61 ++ .../Jobs/Epistemics/mystagogue.yml | 53 +- .../Jobs/Epistemics/mystic.yml | 68 +- .../Jobs/Epistemics/noviciate.yml | 65 ++ .../Jobs/Epistemics/psionicMantis.yml | 65 ++ .../Jobs/Epistemics/uncategorized.yml | 162 ++-- .../Jobs/Logistics/cargoTechnician.yml | 56 ++ .../Jobs/Logistics/courier.yml | 65 ++ .../Jobs/Logistics/logisticsOfficer.yml | 65 ++ .../Jobs/Logistics/salvageSpecialist.yml | 51 ++ .../Jobs/Logistics/uncategorized.yml | 65 ++ .../Jobs/Medical/chemist.yml | 65 ++ .../Jobs/Medical/chiefMedicalOfficer.yml | 65 ++ .../Jobs/Medical/medicalDoctor.yml | 65 ++ .../Jobs/Medical/medicalIntern.yml | 65 ++ .../Jobs/Medical/paramedic.yml | 65 ++ .../Jobs/Medical/seniorPhysician.yml | 65 ++ .../Jobs/Medical/uncategorized.yml | 166 ++-- .../Jobs/Security/cadet.yml | 65 ++ .../Jobs/Security/corpsman.yml | 65 ++ .../Jobs/Security/detective.yml | 65 ++ .../Jobs/Security/headOfSecurity.yml | 84 ++ .../Jobs/Security/securityOfficer.yml | 65 ++ .../Jobs/Security/seniorOfficer.yml | 61 ++ .../Jobs/Security/uncategorized.yml | 199 ++--- .../Jobs/Security/warden.yml | 76 +- .../Jobs/Service/bartender.yml | 94 +++ .../Jobs/Service/botanist.yml | 64 ++ .../CharacterItemGroups/Jobs/Service/chef.yml | 80 ++ .../Jobs/Service/clown.yml | 65 ++ .../Jobs/Service/janitor.yml | 65 ++ .../Jobs/Service/lawyer.yml | 65 ++ .../CharacterItemGroups/Jobs/Service/mime.yml | 65 ++ .../Jobs/Service/musician.yml | 63 +- .../Jobs/Service/reporter.yml | 65 ++ .../Jobs/Service/uncategorized.yml | 219 ++--- .../Jobs/jobItemGroupTemplate.yml | 66 ++ .../Loadouts/Jobs/Service/musician.yml | 84 +- .../Loadouts/Jobs/Service/uncategorized.yml | 2 +- 53 files changed, 3656 insertions(+), 964 deletions(-) delete mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/jobItemGroupTemplate.yml diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index 890537549eb..5a1f18994ad 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -18,110 +18,761 @@ character-item-group-LoadoutSmokes = Smokeables character-item-group-LoadoutBoxKits = Survival Kits character-item-group-LoadoutWritables = Writing Tools +# Job Specific Template +character-item-group-LoadoutJOBBackpacks = JOB Backpacks +character-item-group-LoadoutJOBBelt = JOB Belt +character-item-group-LoadoutJOBEars = JOB Ears +character-item-group-LoadoutJOBEquipment = JOB Equipment +character-item-group-LoadoutJOBEyes = JOB Eyewear +character-item-group-LoadoutJOBloves = JOB Gloves +character-item-group-LoadoutJOBHead = JOB Headgear +character-item-group-LoadoutJOBId = JOB Id +character-item-group-LoadoutJOBNeck = JOB Neckwear +character-item-group-LoadoutJOBMask = JOB Masks +character-item-group-LoadoutJOBOuter = JOB Outerwear +character-item-group-LoadoutJOBShoes = JOB Shoes +character-item-group-LoadoutJOBUniforms = JOB Uniforms + # Command +character-item-group-LoadoutCommandBackpacks = Command Backpacks +character-item-group-LoadoutCommandBelt = Command Belt +character-item-group-LoadoutCommandEars = Command Ears +character-item-group-LoadoutCommandEquipment = Command Equipment +character-item-group-LoadoutCommandEyes = Command Eyewear +character-item-group-LoadoutCommandloves = Command Gloves +character-item-group-LoadoutCommandHead = Command Headgear +character-item-group-LoadoutCommandId = Command Id +character-item-group-LoadoutCommandNeck = Command Neckwear +character-item-group-LoadoutCommandMask = Command Masks +character-item-group-LoadoutCommandOuter = Command Outerwear +character-item-group-LoadoutCommandShoes = Command Shoes +character-item-group-LoadoutCommandUniforms = Command Uniforms + # Command - Captain character-item-group-LoadoutCaptainBackpacks = Captain Backpacks character-item-group-LoadoutCaptainBelt = Captain's Belt +character-item-group-LoadoutCaptainEars = Captain Ears +character-item-group-LoadoutCaptainEquipment = Captain Equipment character-item-group-LoadoutCaptainTrinkets = Captain's Trinkets character-item-group-LoadoutCaptainWeapon = Captain's Personal Weapon character-item-group-LoadoutCaptainEyes = Captain's Eyewear character-item-group-LoadoutCaptainGloves = Captain's Gloves character-item-group-LoadoutCaptainHead = Captain's Headgear +character-item-group-LoadoutCaptainId = Captain's Id character-item-group-LoadoutCaptainNeck = Captain's Neckwear character-item-group-LoadoutCaptainMask = Captain's Masks character-item-group-LoadoutCaptainOuter = Captain's Outerwear character-item-group-LoadoutCaptainShoes = Captain's Shoes -character-item-group-LoadoutCaptainUniform = Captain's Uniforms +character-item-group-LoadoutCaptainUniforms = Captain's Uniforms # Command - Head Of Personnel -character-item-group-LoadoutHeadOfPersonnelBackpacks = HoP's Backpacks -character-item-group-LoadoutHeadOfPersonnelBelt = HoP's Belt -character-item-group-LoadoutHeadOfPersonnelTrinkets = HoP's Trinkets -character-item-group-LoadoutHeadOfPersonnelGloves = HoP's Gloves -character-item-group-LoadoutHeadOfPersonnelHead = HoP's Headgear -character-item-group-LoadoutHeadOfPersonnelNeck = HoP's Neckwear -character-item-group-LoadoutHeadOfPersonnelOuter = HoP's Outerwear -character-item-group-LoadoutHeadOfPersonnelShoes = HoP's Shoes -character-item-group-LoadoutHeadOfPersonnelUniform = HoP's Uniforms - -# Logistics +character-item-group-LoadoutHeadOfPersonnelBackpacks = Head of Personnel Backpacks +character-item-group-LoadoutHeadOfPersonnelBelt = Head of Personnel Belt +character-item-group-LoadoutHeadOfPersonnelEars = Head of Personnel Ears +character-item-group-LoadoutHeadOfPersonnelEquipment = Head of Personnel Equipment +character-item-group-LoadoutHeadOfPersonnelTrinkets = Head of Personnel Trinkets +character-item-group-LoadoutHeadOfPersonnelEyes = Head of Personnel Eyewear +character-item-group-LoadoutHeadOfPersonnelGloves = Head of Personnel Gloves +character-item-group-LoadoutHeadOfPersonnelHead = Head of Personnel Headgear +character-item-group-LoadoutHeadOfPersonnelId = Head of Personnel Id +character-item-group-LoadoutHeadOfPersonnelNeck = Head of Personnel Neckwear +character-item-group-LoadoutHeadOfPersonnelOuter = Head of Personnel Outerwear +character-item-group-LoadoutHeadOfPersonnelShoes = Head of Personnel Shoes +character-item-group-LoadoutHeadOfPersonnelUniforms = Head of Personnel Uniforms # Engineering -character-item-group-LoadoutEyesEngineering = Engineering Eyewear -character-item-group-LoadoutHeadEngineering = Engineering Headgear -character-item-group-LoadoutOuterEngineering = Engineering Outerwear -character-item-group-LoadoutUniformsEngineering = Engineering Uniforms +character-item-group-LoadoutEngineeringBackpacks = Engineering Backpacks +character-item-group-LoadoutEngineeringBelt = Engineering Belt +character-item-group-LoadoutEngineeringEars = Engineering Ears +character-item-group-LoadoutEngineeringEquipment = Engineering Equipment +character-item-group-LoadoutEngineeringEyes = Engineering Eyewear +character-item-group-LoadoutEngineeringGloves = Engineering Gloves +character-item-group-LoadoutEngineeringHead = Engineering Headgear +character-item-group-LoadoutEngineeringId = Engineering Id +character-item-group-LoadoutEngineeringNeck = Engineering Neckwear +character-item-group-LoadoutEngineeringMask = Engineering Masks +character-item-group-LoadoutEngineeringOuter = Engineering Outerwear +character-item-group-LoadoutEngineeringShoes = Engineering Shoes +character-item-group-LoadoutEngineeringUniforms = Engineering Uniforms + +# Engineering - Atmospheric Technician +character-item-group-LoadoutAtmosphericTechnicianBackpacks = Atmospheric Technician Backpacks +character-item-group-LoadoutAtmosphericTechnicianBelt = Atmospheric Technician Belt +character-item-group-LoadoutAtmosphericTechnicianEars = Atmospheric Technician Ears +character-item-group-LoadoutAtmosphericTechnicianEquipment = Atmospheric Technician Equipment +character-item-group-LoadoutAtmosphericTechnicianEyes = Atmospheric Technician Eyewear +character-item-group-LoadoutAtmosphericTechniciangloves = Atmospheric Technician Gloves +character-item-group-LoadoutAtmosphericTechnicianHead = Atmospheric Technician Headgear +character-item-group-LoadoutAtmosphericTechnicianId = Atmospheric Technician Id +character-item-group-LoadoutAtmosphericTechnicianNeck = Atmospheric Technician Neckwear +character-item-group-LoadoutAtmosphericTechnicianMask = Atmospheric Technician Masks +character-item-group-LoadoutAtmosphericTechnicianOuter = Atmospheric Technician Outerwear +character-item-group-LoadoutAtmosphericTechnicianShoes = Atmospheric Technician Shoes +character-item-group-LoadoutAtmosphericTechnicianUniforms = Atmospheric Technician Uniforms + +# Engineering - Chief Engineer +character-item-group-LoadoutChiefEngineerBackpacks = Chief Engineer Backpacks +character-item-group-LoadoutChiefEngineerBelt = Chief Engineer Belt +character-item-group-LoadoutChiefEngineerEars = Chief Engineer Ears +character-item-group-LoadoutChiefEngineerEquipment = Chief Engineer Equipment +character-item-group-LoadoutChiefEngineerEyes = Chief Engineer Eyewear +character-item-group-LoadoutChiefEngineerGloves = Chief Engineer Gloves +character-item-group-LoadoutChiefEngineerHead = Chief Engineer Headgear +character-item-group-LoadoutChiefEngineerId = Chief Engineer Id +character-item-group-LoadoutChiefEngineerNeck = Chief Engineer Neckwear +character-item-group-LoadoutChiefEngineerMask = Chief Engineer Masks +character-item-group-LoadoutChiefEngineerOuter = Chief Engineer Outerwear +character-item-group-LoadoutChiefEngineerShoes = Chief Engineer Shoes +character-item-group-LoadoutChiefEngineerUniforms = Chief Engineer Uniforms + +# Engineering - Senior Engineer +character-item-group-LoadoutSeniorEngineerBackpacks = Senior Engineer Backpacks +character-item-group-LoadoutSeniorEngineerBelt = Senior Engineer Belt +character-item-group-LoadoutSeniorEngineerEars = Senior Engineer Ears +character-item-group-LoadoutSeniorEngineerEquipment = Senior Engineer Equipment +character-item-group-LoadoutSeniorEngineerEyes = Senior Engineer Eyewear +character-item-group-LoadoutSeniorEngineerGloves = Senior Engineer Gloves +character-item-group-LoadoutSeniorEngineerHead = Senior Engineer Headgear +character-item-group-LoadoutSeniorEngineerId = Senior Engineer Id +character-item-group-LoadoutSeniorEngineerNeck = Senior Engineer Neckwear +character-item-group-LoadoutSeniorEngineerMask = Senior Engineer Masks +character-item-group-LoadoutSeniorEngineerOuter = Senior Engineer Outerwear +character-item-group-LoadoutSeniorEngineerShoes = Senior Engineer Shoes +character-item-group-LoadoutSeniorEngineerUniforms = Senior Engineer Uniforms + +# Engineering - Station Engineer +character-item-group-LoadoutStationEngineerBackpacks = Station Engineer Backpacks +character-item-group-LoadoutStationEngineerBelt = Station Engineer Belt +character-item-group-LoadoutStationEngineerEars = Station Engineer Ears +character-item-group-LoadoutStationEngineerEquipment = Station Engineer Equipment +character-item-group-LoadoutStationEngineerEyes = Station Engineer Eyewear +character-item-group-LoadoutStationEngineerGloves = Station Engineer Gloves +character-item-group-LoadoutStationEngineerHead = Station Engineer Headgear +character-item-group-LoadoutStationEngineerId = Station Engineer Id +character-item-group-LoadoutStationEngineerNeck = Station Engineer Neckwear +character-item-group-LoadoutStationEngineerMask = Station Engineer Masks +character-item-group-LoadoutStationEngineerOuter = Station Engineer Outerwear +character-item-group-LoadoutStationEngineerShoes = Station Engineer Shoes +character-item-group-LoadoutStationEngineerUniforms = Station Engineer Uniforms + +# Engineering - Technical Assistant +character-item-group-LoadoutTechnicalAssistantBackpacks = Technical Assistant Backpacks +character-item-group-LoadoutTechnicalAssistantBelt = Technical Assistant Belt +character-item-group-LoadoutTechnicalAssistantEars = Technical Assistant Ears +character-item-group-LoadoutTechnicalAssistantEquipment = Technical Assistant Equipment +character-item-group-LoadoutTechnicalAssistantEyes = Technical Assistant Eyewear +character-item-group-LoadoutTechnicalAssistantGloves = Technical Assistant Gloves +character-item-group-LoadoutTechnicalAssistantHead = Technical Assistant Headgear +character-item-group-LoadoutTechnicalAssistantId = Technical Assistant Id +character-item-group-LoadoutTechnicalAssistantNeck = Technical Assistant Neckwear +character-item-group-LoadoutTechnicalAssistantMask = Technical Assistant Masks +character-item-group-LoadoutTechnicalAssistantOuter = Technical Assistant Outerwear +character-item-group-LoadoutTechnicalAssistantShoes = Technical Assistant Shoes +character-item-group-LoadoutTechnicalAssistantUniforms = Technical Assistant Uniforms # Epistemics -character-item-group-LoadoutEyesScience = Epistemics Eyewear -character-item-group-LoadoutGlovesScience = Epistemics Gloves -character-item-group-LoadoutHeadScience = Epistemics Headgear -character-item-group-LoadoutMaskScience = Epistemics Masks -character-item-group-LoadoutNeckScience = Epistemics Neckwear -character-item-group-LoadoutOuterScience = Epistemics Outerwear -character-item-group-LoadoutShoesScience = Epistemics Shoes -character-item-group-LoadoutUniformsScience = Epistemics Uniforms +character-item-group-LoadoutEpistemicsBackpacks = Epistemics Backpacks +character-item-group-LoadoutEpistemicsBelt = Epistemics Belt +character-item-group-LoadoutEpistemicsEars = Epistemics Ears +character-item-group-LoadoutEpistemicsEquipment = Epistemics Equipment +character-item-group-LoadoutEpistemicsEyes = Epistemics Eyewear +character-item-group-LoadoutEpistemicsGloves = Epistemics Gloves +character-item-group-LoadoutEpistemicsHead = Epistemics Headgear +character-item-group-LoadoutEpistemicsId = Epistemics Id +character-item-group-LoadoutEpistemicsNeck = Epistemics Neckwear +character-item-group-LoadoutEpistemicsMask = Epistemics Masks +character-item-group-LoadoutEpistemicsOuter = Epistemics Outerwear +character-item-group-LoadoutEpistemicsShoes = Epistemics Shoes +character-item-group-LoadoutEpistemicsUniforms = Epistemics Uniforms + +# Epistemics - Acolyte +character-item-group-LoadoutAcolyteBackpacks = Acolyte Backpacks +character-item-group-LoadoutAcolyteBelt = Acolyte Belt +character-item-group-LoadoutAcolyteEars = Acolyte Ears +character-item-group-LoadoutAcolyteEquipment = Acolyte Equipment +character-item-group-LoadoutAcolyteEyes = Acolyte Eyewear +character-item-group-LoadoutAcolyteGloves = Acolyte Gloves +character-item-group-LoadoutAcolyteHead = Acolyte Headgear +character-item-group-LoadoutAcolyteId = Acolyte Id +character-item-group-LoadoutAcolyteNeck = Acolyte Neckwear +character-item-group-LoadoutAcolyteMask = Acolyte Masks +character-item-group-LoadoutAcolyteOuter = Acolyte Outerwear +character-item-group-LoadoutAcolyteShoes = Acolyte Shoes +character-item-group-LoadoutAcolyteUniforms = Acolyte Uniforms # Epistemics - Cataloger -character-item-group-LoadoutCataloguerUniforms = Cataloger Uniforms +character-item-group-LoadoutCatalogerBackpacks = Cataloger Backpacks +character-item-group-LoadoutCatalogerBelt = Cataloger Belt +character-item-group-LoadoutCatalogerEars = Cataloger Ears +character-item-group-LoadoutCatalogerEquipment = Cataloger Equipment +character-item-group-LoadoutCatalogerEyes = Cataloger Eyewear +character-item-group-LoadoutCatalogerGloves = Cataloger Gloves +character-item-group-LoadoutCatalogerHead = Cataloger Headgear +character-item-group-LoadoutCatalogerId = Cataloger Id +character-item-group-LoadoutCatalogerNeck = Cataloger Neckwear +character-item-group-LoadoutCatalogerMask = Cataloger Masks +character-item-group-LoadoutCatalogerOuter = Cataloger Outerwear +character-item-group-LoadoutCatalogerShoes = Cataloger Shoes +character-item-group-LoadoutCatalogerUniforms = Cataloger Uniforms # Epistemics - Chaplain -character-item-group-LoadoutChaplainUniforms = Chaplain Uniforms +character-item-group-LoadoutChaplainBackpacks = Chaplain Backpacks +character-item-group-LoadoutChaplainBelt = Chaplain Belt +character-item-group-LoadoutChaplainEars = Chaplain Ears character-item-group-LoadoutChaplainEquipment = Chaplain Equipment +character-item-group-LoadoutChaplainEyes = Chaplain Eyewear +character-item-group-LoadoutChaplainGloves = Chaplain Gloves +character-item-group-LoadoutChaplainHead = Chaplain Headgear +character-item-group-LoadoutChaplainId = Chaplain Id +character-item-group-LoadoutChaplainNeck = Chaplain Neckwear +character-item-group-LoadoutChaplainMask = Chaplain Masks +character-item-group-LoadoutChaplainOuter = Chaplain Outerwear +character-item-group-LoadoutChaplainShoes = Chaplain Shoes +character-item-group-LoadoutChaplainUniforms = Chaplain Uniforms + +# Epistemics - Golemancer +character-item-group-LoadoutGolemancerBackpacks = Golemancer Backpacks +character-item-group-LoadoutGolemancerBelt = Golemancer Belt +character-item-group-LoadoutGolemancerEars = Golemancer Ears +character-item-group-LoadoutGolemancerEquipment = Golemancer Equipment +character-item-group-LoadoutGolemancerEyes = Golemancer Eyewear +character-item-group-LoadoutGolemancerGloves = Golemancer Gloves +character-item-group-LoadoutGolemancerHead = Golemancer Headgear +character-item-group-LoadoutGolemancerId = Golemancer Id +character-item-group-LoadoutGolemancerNeck = Golemancer Neckwear +character-item-group-LoadoutGolemancerMask = Golemancer Masks +character-item-group-LoadoutGolemancerOuter = Golemancer Outerwear +character-item-group-LoadoutGolemancerShoes = Golemancer Shoes +character-item-group-LoadoutGolemancerUniforms = Golemancer Uniforms + +# Epistemics - Mystagogue +character-item-group-LoadoutMystagogueBackpacks = Mystagogue Backpacks +character-item-group-LoadoutMystagogueBelt = Mystagogue Belt +character-item-group-LoadoutMystagogueEars = Mystagogue Ears +character-item-group-LoadoutMystagogueEquipment = Mystagogue Equipment +character-item-group-LoadoutMystagogueEyes = Mystagogue Eyewear +character-item-group-LoadoutMystagogueGloves = Mystagogue Gloves +character-item-group-LoadoutMystagogueHead = Mystagogue Headgear +character-item-group-LoadoutMystagogueId = Mystagogue Id +character-item-group-LoadoutMystagogueNeck = Mystagogue Neckwear +character-item-group-LoadoutMystagogueMask = Mystagogue Masks +character-item-group-LoadoutMystagogueOuter = Mystagogue Outerwear +character-item-group-LoadoutMystagogueShoes = Mystagogue Shoes +character-item-group-LoadoutMystagogueUniforms = Mystagogue Uniforms + +# Epistemics - Mystic +character-item-group-LoadoutMysticBackpacks = Mystic Backpacks +character-item-group-LoadoutMysticBelt = Mystic Belt +character-item-group-LoadoutMysticEars = Mystic Ears +character-item-group-LoadoutMysticEquipment = Mystic Equipment +character-item-group-LoadoutMysticEyes = Mystic Eyewear +character-item-group-LoadoutMysticGloves = Mystic Gloves +character-item-group-LoadoutMysticHead = Mystic Headgear +character-item-group-LoadoutMysticId = Mystic Id +character-item-group-LoadoutMysticNeck = Mystic Neckwear +character-item-group-LoadoutMysticMask = Mystic Masks +character-item-group-LoadoutMysticOuter = Mystic Outerwear +character-item-group-LoadoutMysticShoes = Mystic Shoes +character-item-group-LoadoutMysticUniforms = Mystic Uniforms + +# Epistemics - Noviciate +character-item-group-LoadoutNoviciateBackpacks = Noviciate Backpacks +character-item-group-LoadoutNoviciateBelt = Noviciate Belt +character-item-group-LoadoutNoviciateEars = Noviciate Ears +character-item-group-LoadoutNoviciateEquipment = Noviciate Equipment +character-item-group-LoadoutNoviciateEyes = Noviciate Eyewear +character-item-group-LoadoutNoviciateGloves = Noviciate Gloves +character-item-group-LoadoutNoviciateHead = Noviciate Headgear +character-item-group-LoadoutNoviciateId = Noviciate Id +character-item-group-LoadoutNoviciateNeck = Noviciate Neckwear +character-item-group-LoadoutNoviciateMask = Noviciate Masks +character-item-group-LoadoutNoviciateOuter = Noviciate Outerwear +character-item-group-LoadoutNoviciateShoes = Noviciate Shoes +character-item-group-LoadoutNoviciateUniforms = Noviciate Uniforms + +# Epistemics - Psionic Mantis +character-item-group-LoadoutPsionicMantisBackpacks = Psionic Mantis Backpacks +character-item-group-LoadoutPsionicMantisBelt = Psionic Mantis Belt +character-item-group-LoadoutPsionicMantisEars = Psionic Mantis Ears +character-item-group-LoadoutPsionicMantisEquipment = Psionic Mantis Equipment +character-item-group-LoadoutPsionicMantisEyes = Psionic Mantis Eyewear +character-item-group-LoadoutPsionicMantisGloves = Psionic Mantis Gloves +character-item-group-LoadoutPsionicMantisHead = Psionic Mantis Headgear +character-item-group-LoadoutPsionicMantisId = Psionic Mantis Id +character-item-group-LoadoutPsionicMantisNeck = Psionic Mantis Neckwear +character-item-group-LoadoutPsionicMantisMask = Psionic Mantis Masks +character-item-group-LoadoutPsionicMantisOuter = Psionic Mantis Outerwear +character-item-group-LoadoutPsionicMantisShoes = Psionic Mantis Shoes +character-item-group-LoadoutPsionicMantisUniforms = Psionic Mantis Uniforms + +# Logistics +character-item-group-LoadoutLogisticsBackpacks = Logistics Backpacks +character-item-group-LoadoutLogisticsBelt = Logistics Belt +character-item-group-LoadoutLogisticsEars = Logistics Ears +character-item-group-LoadoutLogisticsEquipment = Logistics Equipment +character-item-group-LoadoutLogisticsEyes = Logistics Eyewear +character-item-group-LoadoutLogisticsGloves = Logistics Gloves +character-item-group-LoadoutLogisticsHead = Logistics Headgear +character-item-group-LoadoutLogisticsId = Logistics Id +character-item-group-LoadoutLogisticsNeck = Logistics Neckwear +character-item-group-LoadoutLogisticsMask = Logistics Masks +character-item-group-LoadoutLogisticsOuter = Logistics Outerwear +character-item-group-LoadoutLogisticsShoes = Logistics Shoes +character-item-group-LoadoutLogisticsUniforms = Logistics Uniforms + +# Logistics - Cargo Technician +character-item-group-LoadoutCargoTechnicianBackpacks = Cargo Technician Backpacks +character-item-group-LoadoutCargoTechnicianBelt = Cargo Technician Belt +character-item-group-LoadoutCargoTechnicianEars = Cargo Technician Ears +character-item-group-LoadoutCargoTechnicianEquipment = Cargo Technician Equipment +character-item-group-LoadoutCargoTechnicianEyes = Cargo Technician Eyewear +character-item-group-LoadoutCargoTechnicianGloves = Cargo Technician Gloves +character-item-group-LoadoutCargoTechnicianHead = Cargo Technician Headgear +character-item-group-LoadoutCargoTechnicianId = Cargo Technician Id +character-item-group-LoadoutCargoTechnicianNeck = Cargo Technician Neckwear +character-item-group-LoadoutCargoTechnicianMask = Cargo Technician Masks +character-item-group-LoadoutCargoTechnicianOuter = Cargo Technician Outerwear +character-item-group-LoadoutCargoTechnicianShoes = Cargo Technician Shoes +character-item-group-LoadoutCargoTechnicianUniforms = Cargo Technician Uniforms + +# Logistics - Courier +character-item-group-LoadoutCourierBackpacks = Courier Backpacks +character-item-group-LoadoutCourierBelt = Courier Belt +character-item-group-LoadoutCourierEars = Courier Ears +character-item-group-LoadoutCourierEquipment = Courier Equipment +character-item-group-LoadoutCourierEyes = Courier Eyewear +character-item-group-LoadoutCourierGloves = Courier Gloves +character-item-group-LoadoutCourierHead = Courier Headgear +character-item-group-LoadoutCourierId = Courier Id +character-item-group-LoadoutCourierNeck = Courier Neckwear +character-item-group-LoadoutCourierMask = Courier Masks +character-item-group-LoadoutCourierOuter = Courier Outerwear +character-item-group-LoadoutCourierShoes = Courier Shoes +character-item-group-LoadoutCourierUniforms = Courier Uniforms + +# Logistics - Logistics Officer +character-item-group-LoadoutLogisticsOfficerBackpacks = Logistics Officer Backpacks +character-item-group-LoadoutLogisticsOfficerBelt = Logistics Officer Belt +character-item-group-LoadoutLogisticsOfficerEars = Logistics Officer Ears +character-item-group-LoadoutLogisticsOfficerEquipment = Logistics Officer Equipment +character-item-group-LoadoutLogisticsOfficerEyes = Logistics Officer Eyewear +character-item-group-LoadoutLogisticsOfficerGloves = Logistics Officer Gloves +character-item-group-LoadoutLogisticsOfficerHead = Logistics Officer Headgear +character-item-group-LoadoutLogisticsOfficerId = Logistics Officer Id +character-item-group-LoadoutLogisticsOfficerNeck = Logistics Officer Neckwear +character-item-group-LoadoutLogisticsOfficerMask = Logistics Officer Masks +character-item-group-LoadoutLogisticsOfficerOuter = Logistics Officer Outerwear +character-item-group-LoadoutLogisticsOfficerShoes = Logistics Officer Shoes +character-item-group-LoadoutLogisticsOfficerUniforms = Logistics Officer Uniforms + +# Logistics - Salvage Specialist +character-item-group-LoadoutSalvageSpecialistBackpacks = Salvage Specialist Backpacks +character-item-group-LoadoutSalvageSpecialistBelt = Salvage Specialist Belt +character-item-group-LoadoutSalvageSpecialistEars = Salvage Specialist Ears +character-item-group-LoadoutSalvageSpecialistEquipment = Salvage Specialist Equipment +character-item-group-LoadoutSalvageSpecialistEyes = Salvage Specialist Eyewear +character-item-group-LoadoutSalvageSpecialistGloves = Salvage Specialist Gloves +character-item-group-LoadoutSalvageSpecialistHead = Salvage Specialist Headgear +character-item-group-LoadoutSalvageSpecialistId = Salvage Specialist Id +character-item-group-LoadoutSalvageSpecialistNeck = Salvage Specialist Neckwear +character-item-group-LoadoutSalvageSpecialistMask = Salvage Specialist Masks +character-item-group-LoadoutSalvageSpecialistOuter = Salvage Specialist Outerwear +character-item-group-LoadoutSalvageSpecialistShoes = Salvage Specialist Shoes +character-item-group-LoadoutSalvageSpecialistUniforms = Salvage Specialist Uniforms # Medical -character-item-group-LoadoutEyesMedical = Medical Eyewear -character-item-group-LoadoutGlovesMedical = Medical Gloves -character-item-group-LoadoutHeadMedical = Medical Headgear -character-item-group-LoadoutNeckMedical = Medical Neckwear -character-item-group-LoadoutOuterMedical = Medical Outerwear -character-item-group-LoadoutShoesMedical = Medical Shoes -character-item-group-LoadoutUniformsMedical = Medical Uniforms +character-item-group-LoadoutMedicalBackpacks = Medical Backpacks +character-item-group-LoadoutMedicalBelt = Medical Belt +character-item-group-LoadoutMedicalEars = Medical Ears +character-item-group-LoadoutMedicalEquipment = Medical Equipment +character-item-group-LoadoutMedicalEyes = Medical Eyewear +character-item-group-LoadoutMedicalGloves = Medical Gloves +character-item-group-LoadoutMedicalHead = Medical Headgear +character-item-group-LoadoutMedicalId = Medical Id +character-item-group-LoadoutMedicalNeck = Medical Neckwear +character-item-group-LoadoutMedicalMask = Medical Masks +character-item-group-LoadoutMedicalOuter = Medical Outerwear +character-item-group-LoadoutMedicalShoes = Medical Shoes +character-item-group-LoadoutMedicalUniforms = Medical Uniforms + +# Medical - Chemist +character-item-group-LoadoutChemistBackpacks = Chemist Backpacks +character-item-group-LoadoutChemistBelt = Chemist Belt +character-item-group-LoadoutChemistEars = Chemist Ears +character-item-group-LoadoutChemistEquipment = Chemist Equipment +character-item-group-LoadoutChemistEyes = Chemist Eyewear +character-item-group-LoadoutChemistGloves = Chemist Gloves +character-item-group-LoadoutChemistHead = Chemist Headgear +character-item-group-LoadoutChemistId = Chemist Id +character-item-group-LoadoutChemistNeck = Chemist Neckwear +character-item-group-LoadoutChemistMask = Chemist Masks +character-item-group-LoadoutChemistOuter = Chemist Outerwear +character-item-group-LoadoutChemistShoes = Chemist Shoes +character-item-group-LoadoutChemistUniforms = Chemist Uniforms + +# Medical - Chief Medical Officer +character-item-group-LoadoutChiefMedicalOfficerBackpacks = Chief Medical Officer Backpacks +character-item-group-LoadoutChiefMedicalOfficerBelt = Chief Medical Officer Belt +character-item-group-LoadoutChiefMedicalOfficerEars = Chief Medical Officer Ears +character-item-group-LoadoutChiefMedicalOfficerEquipment = Chief Medical Officer Equipment +character-item-group-LoadoutChiefMedicalOfficerEyes = Chief Medical Officer Eyewear +character-item-group-LoadoutChiefMedicalOfficerGloves = Chief Medical Officer Gloves +character-item-group-LoadoutChiefMedicalOfficerHead = Chief Medical Officer Headgear +character-item-group-LoadoutChiefMedicalOfficerId = Chief Medical Officer Id +character-item-group-LoadoutChiefMedicalOfficerNeck = Chief Medical Officer Neckwear +character-item-group-LoadoutChiefMedicalOfficerMask = Chief Medical Officer Masks +character-item-group-LoadoutChiefMedicalOfficerOuter = Chief Medical Officer Outerwear +character-item-group-LoadoutChiefMedicalOfficerShoes = Chief Medical Officer Shoes +character-item-group-LoadoutChiefMedicalOfficerUniforms = Chief Medical Officer Uniforms + +# Medical - Medical Doctor +character-item-group-LoadoutMedicalDoctorBackpacks = Medical Doctor Backpacks +character-item-group-LoadoutMedicalDoctorBelt = Medical Doctor Belt +character-item-group-LoadoutMedicalDoctorEars = Medical Doctor Ears +character-item-group-LoadoutMedicalDoctorEquipment = Medical Doctor Equipment +character-item-group-LoadoutMedicalDoctorEyes = Medical Doctor Eyewear +character-item-group-LoadoutMedicalDoctorGloves = Medical Doctor Gloves +character-item-group-LoadoutMedicalDoctorHead = Medical Doctor Headgear +character-item-group-LoadoutMedicalDoctorId = Medical Doctor Id +character-item-group-LoadoutMedicalDoctorNeck = Medical Doctor Neckwear +character-item-group-LoadoutMedicalDoctorMask = Medical Doctor Masks +character-item-group-LoadoutMedicalDoctorOuter = Medical Doctor Outerwear +character-item-group-LoadoutMedicalDoctorShoes = Medical Doctor Shoes +character-item-group-LoadoutMedicalDoctorUniforms = Medical Doctor Uniforms + +# Medical - Medical Intern +character-item-group-LoadoutMedicalInternBackpacks = Medical Intern Backpacks +character-item-group-LoadoutMedicalInternBelt = Medical Intern Belt +character-item-group-LoadoutMedicalInternEars = Medical Intern Ears +character-item-group-LoadoutMedicalInternEquipment = Medical Intern Equipment +character-item-group-LoadoutMedicalInternEyes = Medical Intern Eyewear +character-item-group-LoadoutMedicalInternGloves = Medical Intern Gloves +character-item-group-LoadoutMedicalInternHead = Medical Intern Headgear +character-item-group-LoadoutMedicalInternId = Medical Intern Id +character-item-group-LoadoutMedicalInternNeck = Medical Intern Neckwear +character-item-group-LoadoutMedicalInternMask = Medical Intern Masks +character-item-group-LoadoutMedicalInternOuter = Medical Intern Outerwear +character-item-group-LoadoutMedicalInternShoes = Medical Intern Shoes +character-item-group-LoadoutMedicalInternUniforms = Medical Intern Uniforms + +# Medical - Paramedic +character-item-group-LoadoutParamedicBackpacks = Paramedic Backpacks +character-item-group-LoadoutParamedicBelt = Paramedic Belt +character-item-group-LoadoutParamedicEars = Paramedic Ears +character-item-group-LoadoutParamedicEquipment = Paramedic Equipment +character-item-group-LoadoutParamedicEyes = Paramedic Eyewear +character-item-group-LoadoutParamedicGloves = Paramedic Gloves +character-item-group-LoadoutParamedicHead = Paramedic Headgear +character-item-group-LoadoutParamedicId = Paramedic Id +character-item-group-LoadoutParamedicNeck = Paramedic Neckwear +character-item-group-LoadoutParamedicMask = Paramedic Masks +character-item-group-LoadoutParamedicOuter = Paramedic Outerwear +character-item-group-LoadoutParamedicShoes = Paramedic Shoes +character-item-group-LoadoutParamedicUniforms = Paramedic Uniforms + +# Medical - Psychologist +character-item-group-LoadoutPsychologistBackpacks = Psychologist Backpacks +character-item-group-LoadoutPsychologistBelt = Psychologist Belt +character-item-group-LoadoutPsychologistEars = Psychologist Ears +character-item-group-LoadoutPsychologistEquipment = Psychologist Equipment +character-item-group-LoadoutPsychologistEyes = Psychologist Eyewear +character-item-group-LoadoutPsychologistGloves = Psychologist Gloves +character-item-group-LoadoutPsychologistHead = Psychologist Headgear +character-item-group-LoadoutPsychologistId = Psychologist Id +character-item-group-LoadoutPsychologistNeck = Psychologist Neckwear +character-item-group-LoadoutPsychologistMask = Psychologist Masks +character-item-group-LoadoutPsychologistOuter = Psychologist Outerwear +character-item-group-LoadoutPsychologistShoes = Psychologist Shoes +character-item-group-LoadoutPsychologistUniforms = Psychologist Uniforms + +# Medical - Senior Physician +character-item-group-LoadoutSeniorPhysicianBackpacks = Senior Physician Backpacks +character-item-group-LoadoutSeniorPhysicianBelt = Senior Physician Belt +character-item-group-LoadoutSeniorPhysicianEars = Senior Physician Ears +character-item-group-LoadoutSeniorPhysicianEquipment = Senior Physician Equipment +character-item-group-LoadoutSeniorPhysicianEyes = Senior Physician Eyewear +character-item-group-LoadoutSeniorPhysicianGloves = Senior Physician Gloves +character-item-group-LoadoutSeniorPhysicianHead = Senior Physician Headgear +character-item-group-LoadoutSeniorPhysicianId = Senior Physician Id +character-item-group-LoadoutSeniorPhysicianNeck = Senior Physician Neckwear +character-item-group-LoadoutSeniorPhysicianMask = Senior Physician Masks +character-item-group-LoadoutSeniorPhysicianOuter = Senior Physician Outerwear +character-item-group-LoadoutSeniorPhysicianShoes = Senior Physician Shoes +character-item-group-LoadoutSeniorPhysicianUniforms = Senior Physician Uniforms # Security -character-item-group-LoadoutBackSecurity = Security Backpacks -character-item-group-LoadoutBeltSecurity = Security Belts -character-item-group-LoadoutEquipmentSecurity = Security Equipment -character-item-group-LoadoutEyesSecurity = Security Eyewear -character-item-group-LoadoutGlovesSecurity = Security Gloves -character-item-group-LoadoutHeadSecurity = Security Headgear -character-item-group-LoadoutMaskSecurity = Security Masks -character-item-group-LoadoutNeckSecurity = Security Neckwear -character-item-group-LoadoutOuterSecurity = Security Outerwear -character-item-group-LoadoutShoesSecurity = Security Shoes -character-item-group-LoadoutUniformsSecurity = Security Uniforms -character-item-group-LoadoutWeaponSecurity = Security Duty Weapon -character-item-group-LoadoutHoSWeapon = Head of Security's Antique Weapon Collection +character-item-group-LoadoutSecurityBackpacks = Security Backpacks +character-item-group-LoadoutSecurityBelt = Security Belt +character-item-group-LoadoutSecurityEars = Security Ears +character-item-group-LoadoutSecurityEquipment = Security Equipment +character-item-group-LoadoutSecurityWeapons = Security Duty Weapon +character-item-group-LoadoutSecurityEyes = Security Eyewear +character-item-group-LoadoutSecurityGloves = Security Gloves +character-item-group-LoadoutSecurityHead = Security Headgear +character-item-group-LoadoutSecurityId = Security Id +character-item-group-LoadoutSecurityNeck = Security Neckwear +character-item-group-LoadoutSecurityMask = Security Masks +character-item-group-LoadoutSecurityOuter = Security Outerwear +character-item-group-LoadoutSecurityShoes = Security Shoes +character-item-group-LoadoutSecurityUniforms = Security Uniforms + +# Security - Cadet +character-item-group-LoadoutCadetBackpacks = Cadet Backpacks +character-item-group-LoadoutCadetBelt = Cadet Belt +character-item-group-LoadoutCadetEars = Cadet Ears +character-item-group-LoadoutCadetEquipment = Cadet Equipment +character-item-group-LoadoutCadetEyes = Cadet Eyewear +character-item-group-LoadoutCadetGloves = Cadet Gloves +character-item-group-LoadoutCadetHead = Cadet Headgear +character-item-group-LoadoutCadetId = Cadet Id +character-item-group-LoadoutCadetNeck = Cadet Neckwear +character-item-group-LoadoutCadetMask = Cadet Masks +character-item-group-LoadoutCadetOuter = Cadet Outerwear +character-item-group-LoadoutCadetShoes = Cadet Shoes +character-item-group-LoadoutCadetUniforms = Cadet Uniforms + +# Security - Corpsman +character-item-group-LoadoutCorpsmanBackpacks = Corpsman Backpacks +character-item-group-LoadoutCorpsmanBelt = Corpsman Belt +character-item-group-LoadoutCorpsmanEars = Corpsman Ears +character-item-group-LoadoutCorpsmanEquipment = Corpsman Equipment +character-item-group-LoadoutCorpsmanEyes = Corpsman Eyewear +character-item-group-LoadoutCorpsmanGloves = Corpsman Gloves +character-item-group-LoadoutCorpsmanHead = Corpsman Headgear +character-item-group-LoadoutCorpsmanId = Corpsman Id +character-item-group-LoadoutCorpsmanNeck = Corpsman Neckwear +character-item-group-LoadoutCorpsmanMask = Corpsman Masks +character-item-group-LoadoutCorpsmanOuter = Corpsman Outerwear +character-item-group-LoadoutCorpsmanShoes = Corpsman Shoes +character-item-group-LoadoutCorpsmanUniforms = Corpsman Uniforms + +# Security - Detective +character-item-group-LoadoutDetectiveBackpacks = Detective Backpacks +character-item-group-LoadoutDetectiveBelt = Detective Belt +character-item-group-LoadoutDetectiveEars = Detective Ears +character-item-group-LoadoutDetectiveEquipment = Detective Equipment +character-item-group-LoadoutDetectiveEyes = Detective Eyewear +character-item-group-LoadoutDetectiveGloves = Detective Gloves +character-item-group-LoadoutDetectiveHead = Detective Headgear +character-item-group-LoadoutDetectiveId = Detective Id +character-item-group-LoadoutDetectiveNeck = Detective Neckwear +character-item-group-LoadoutDetectiveMask = Detective Masks +character-item-group-LoadoutDetectiveOuter = Detective Outerwear +character-item-group-LoadoutDetectiveShoes = Detective Shoes +character-item-group-LoadoutDetectiveUniforms = Detective Uniforms + +# Security - Head Of Security +character-item-group-LoadoutHeadOfSecurityBackpacks = Head Of Security Backpacks +character-item-group-LoadoutHeadOfSecurityBelt = Head Of Security Belt +character-item-group-LoadoutHeadOfSecurityEars = Head Of Security Ears +character-item-group-LoadoutHeadOfSecurityEquipment = Head Of Security Equipment +character-item-group-LoadoutHeadOfSecurityWeapons = Head of Security's Antique Weapon Collection +character-item-group-LoadoutHeadOfSecurityEyes = Head Of Security Eyewear +character-item-group-LoadoutHeadOfSecurityGloves = Head Of Security Gloves +character-item-group-LoadoutHeadOfSecurityHead = Head Of Security Headgear +character-item-group-LoadoutHeadOfSecurityId = Head Of Security Id +character-item-group-LoadoutHeadOfSecurityNeck = Head Of Security Neckwear +character-item-group-LoadoutHeadOfSecurityMask = Head Of Security Masks +character-item-group-LoadoutHeadOfSecurityOuter = Head Of Security Outerwear +character-item-group-LoadoutHeadOfSecurityShoes = Head Of Security Shoes +character-item-group-LoadoutHeadOfSecurityUniforms = Head Of Security Uniforms + +# Security - Security Officer +character-item-group-LoadoutSecurityOfficerBackpacks = Security Officer Backpacks +character-item-group-LoadoutSecurityOfficerBelt = Security Officer Belt +character-item-group-LoadoutSecurityOfficerEars = Security Officer Ears +character-item-group-LoadoutSecurityOfficerEquipment = Security Officer Equipment +character-item-group-LoadoutSecurityOfficerEyes = Security Officer Eyewear +character-item-group-LoadoutSecurityOfficerGloves = Security Officer Gloves +character-item-group-LoadoutSecurityOfficerHead = Security Officer Headgear +character-item-group-LoadoutSecurityOfficerId = Security Officer Id +character-item-group-LoadoutSecurityOfficerNeck = Security Officer Neckwear +character-item-group-LoadoutSecurityOfficerMask = Security Officer Masks +character-item-group-LoadoutSecurityOfficerOuter = Security Officer Outerwear +character-item-group-LoadoutSecurityOfficerShoes = Security Officer Shoes +character-item-group-LoadoutSecurityOfficerUniforms = Security Officer Uniforms + +# Security - Senior Officer +character-item-group-LoadoutSeniorOfficerBackpacks = Senior Officer Backpacks +character-item-group-LoadoutSeniorOfficerBelt = Senior Officer Belt +character-item-group-LoadoutSeniorOfficerEars = Senior Officer Ears +character-item-group-LoadoutSeniorOfficerEquipment = Senior Officer Equipment +character-item-group-LoadoutSeniorOfficerEyes = Senior Officer Eyewear +character-item-group-LoadoutSeniorOfficerGloves = Senior Officer Gloves +character-item-group-LoadoutSeniorOfficerHead = Senior Officer Headgear +character-item-group-LoadoutSeniorOfficerId = Senior Officer Id +character-item-group-LoadoutSeniorOfficerNeck = Senior Officer Neckwear +character-item-group-LoadoutSeniorOfficerMask = Senior Officer Masks +character-item-group-LoadoutSeniorOfficerOuter = Senior Officer Outerwear +character-item-group-LoadoutSeniorOfficerShoes = Senior Officer Shoes +character-item-group-LoadoutSeniorOfficerUniforms = Senior Officer Uniforms + +# Security - Warden +character-item-group-LoadoutWardenBackpacks = Warden Backpacks +character-item-group-LoadoutWardenBelt = Warden Belt +character-item-group-LoadoutWardenEars = Warden Ears +character-item-group-LoadoutWardenEquipment = Warden Equipment +character-item-group-LoadoutWardenEyes = Warden Eyewear +character-item-group-LoadoutWardenGloves = Warden Gloves +character-item-group-LoadoutWardenHead = Warden Headgear +character-item-group-LoadoutWardenId = Warden Id +character-item-group-LoadoutWardenNeck = Warden Neckwear +character-item-group-LoadoutWardenMask = Warden Masks +character-item-group-LoadoutWardenOuter = Warden Outerwear +character-item-group-LoadoutWardenShoes = Warden Shoes +character-item-group-LoadoutWardenUniforms = Warden Uniforms # Service -character-item-group-LoadoutEquipmentService = Service Equipment -character-item-group-LoadoutHeadService = Service Headgear -character-item-group-LoadoutMaskService = Service Masks -character-item-group-LoadoutNeckService = Service Neckwear -character-item-group-LoadoutOuterService = Service Outerwear -character-item-group-LoadoutShoesService = Service Shoes -character-item-group-LoadoutUniformsService = Service Uniforms +character-item-group-LoadoutServiceBackpacks = Service Backpacks +character-item-group-LoadoutServiceBelt = Service Belt +character-item-group-LoadoutServiceEars = Service Ears +character-item-group-LoadoutServiceEquipment = Service Equipment +character-item-group-LoadoutServiceEyes = Service Eyewear +character-item-group-LoadoutServiceGloves = Service Gloves +character-item-group-LoadoutServiceHead = Service Headgear +character-item-group-LoadoutServiceId = Service Id +character-item-group-LoadoutServiceNeck = Service Neckwear +character-item-group-LoadoutServiceMask = Service Masks +character-item-group-LoadoutServiceOuter = Service Outerwear +character-item-group-LoadoutServiceShoes = Service Shoes +character-item-group-LoadoutServiceUniforms = Service Uniforms # Service - Bartender +character-item-group-LoadoutBartenderBackpacks = Bartender Backpacks +character-item-group-LoadoutBartenderBelt = Bartender Belt +character-item-group-LoadoutBartenderEars = Bartender Ears +character-item-group-LoadoutBartenderEquipment = Bartender Equipment character-item-group-LoadoutBartenderAmmo = Bartender Ammo +character-item-group-LoadoutBartenderWeapon = Bartender Weapon +character-item-group-LoadoutBartenderEyes = Bartender Eyewear +character-item-group-LoadoutBartenderGloves = Bartender Gloves character-item-group-LoadoutBartenderHead = Bartender Headgear -character-item-group-LoadoutBartenderOuterwear = Bartender Outerwear +character-item-group-LoadoutBartenderId = Bartender Id +character-item-group-LoadoutBartenderNeck = Bartender Neckwear +character-item-group-LoadoutBartenderMask = Bartender Masks +character-item-group-LoadoutBartenderOuter = Bartender Outerwear +character-item-group-LoadoutBartenderShoes = Bartender Shoes character-item-group-LoadoutBartenderUniforms = Bartender Uniforms -character-item-group-LoadoutBartenderWeapon = Bartender Weapon # Service - Botanist +character-item-group-LoadoutBotanistBackpacks = Botanist Backpacks +character-item-group-LoadoutBotanistBelt = Botanist Belt +character-item-group-LoadoutBotanistEars = Botanist Ears +character-item-group-LoadoutBotanistEquipment = Botanist Equipment +character-item-group-LoadoutBotanistEyes = Botanist Eyewear +character-item-group-LoadoutBotanistGloves = Botanist Gloves +character-item-group-LoadoutBotanistHead = Botanist Headgear +character-item-group-LoadoutBotanistId = Botanist Id +character-item-group-LoadoutBotanistNeck = Botanist Neckwear +character-item-group-LoadoutBotanistMask = Botanist Masks +character-item-group-LoadoutBotanistOuter = Botanist Outerwear +character-item-group-LoadoutBotanistShoes = Botanist Shoes character-item-group-LoadoutBotanistUniforms = Botanist Uniforms # Service - Chef +character-item-group-LoadoutChefBackpacks = Chef Backpacks +character-item-group-LoadoutChefBelt = Chef Belt +character-item-group-LoadoutChefEars = Chef Ears +character-item-group-LoadoutChefEquipment = Chef Equipment +character-item-group-LoadoutChefEyes = Chef Eyewear +character-item-group-LoadoutChefGloves = Chef Gloves character-item-group-LoadoutChefHead = Chef Headgear +character-item-group-LoadoutChefId = Chef Id +character-item-group-LoadoutChefNeck = Chef Neckwear +character-item-group-LoadoutChefMask = Chef Masks character-item-group-LoadoutChefOuter = Chef Outerwear +character-item-group-LoadoutChefShoes = Chef Shoes character-item-group-LoadoutChefUniforms = Chef Uniforms +# Service - Clown +character-item-group-LoadoutClownBackpacks = Clown Backpacks +character-item-group-LoadoutClownBelt = Clown Belt +character-item-group-LoadoutClownEars = Clown Ears +character-item-group-LoadoutClownEquipment = Clown Equipment +character-item-group-LoadoutClownEyes = Clown Eyewear +character-item-group-LoadoutClownGloves = Clown Gloves +character-item-group-LoadoutClownHead = Clown Headgear +character-item-group-LoadoutClownId = Clown Id +character-item-group-LoadoutClownNeck = Clown Neckwear +character-item-group-LoadoutClownMask = Clown Masks +character-item-group-LoadoutClownOuter = Clown Outerwear +character-item-group-LoadoutClownShoes = Clown Shoes +character-item-group-LoadoutClownUniforms = Clown Uniforms + # Service - Janitor +character-item-group-LoadoutJanitorBackpacks = Janitor Backpacks +character-item-group-LoadoutJanitorBelt = Janitor Belt +character-item-group-LoadoutJanitorEars = Janitor Ears +character-item-group-LoadoutJanitorEquipment = Janitor Equipment +character-item-group-LoadoutJanitorEyes = Janitor Eyewear +character-item-group-LoadoutJanitorGloves = Janitor Gloves +character-item-group-LoadoutJanitorHead = Janitor Headgear +character-item-group-LoadoutJanitorId = Janitor Id +character-item-group-LoadoutJanitorNeck = Janitor Neckwear +character-item-group-LoadoutJanitorMask = Janitor Masks +character-item-group-LoadoutJanitorOuter = Janitor Outerwear +character-item-group-LoadoutJanitorShoes = Janitor Shoes character-item-group-LoadoutJanitorUniforms = Janitor Uniforms +# Service - Lawyer +character-item-group-LoadoutLawyerBackpacks = Lawyer Backpacks +character-item-group-LoadoutLawyerBelt = Lawyer Belt +character-item-group-LoadoutLawyerEars = Lawyer Ears +character-item-group-LoadoutLawyerEquipment = Lawyer Equipment +character-item-group-LoadoutLawyerEyes = Lawyer Eyewear +character-item-group-LoadoutLawyerGloves = Lawyer Gloves +character-item-group-LoadoutLawyerHead = Lawyer Headgear +character-item-group-LoadoutLawyerId = Lawyer Id +character-item-group-LoadoutLawyerNeck = Lawyer Neckwear +character-item-group-LoadoutLawyerMask = Lawyer Masks +character-item-group-LoadoutLawyerOuter = Lawyer Outerwear +character-item-group-LoadoutLawyerShoes = Lawyer Shoes +character-item-group-LoadoutLawyerUniforms = Lawyer Uniforms + +# Service - Mime +character-item-group-LoadoutMimeBackpacks = Mime Backpacks +character-item-group-LoadoutMimeBelt = Mime Belt +character-item-group-LoadoutMimeEars = Mime Ears +character-item-group-LoadoutMimeEquipment = Mime Equipment +character-item-group-LoadoutMimeEyes = Mime Eyewear +character-item-group-LoadoutMimeGloves = Mime Gloves +character-item-group-LoadoutMimeHead = Mime Headgear +character-item-group-LoadoutMimeId = Mime Id +character-item-group-LoadoutMimeNeck = Mime Neckwear +character-item-group-LoadoutMimeMask = Mime Masks +character-item-group-LoadoutMimeOuter = Mime Outerwear +character-item-group-LoadoutMimeShoes = Mime Shoes +character-item-group-LoadoutMimeUniforms = Mime Uniforms + # Service - Musician -character-item-group-LoadoutMusicianInstruments = Musician Instruments +character-item-group-LoadoutMusicianBackpacks = Musician Backpacks +character-item-group-LoadoutMusicianBelt = Musician Belt +character-item-group-LoadoutMusicianEars = Musician Ears +character-item-group-LoadoutMusicianEquipment = Musician Equipment +character-item-group-LoadoutMusicianEyes = Musician Eyewear +character-item-group-LoadoutMusicianGloves = Musician Gloves +character-item-group-LoadoutMusicianHead = Musician Headgear +character-item-group-LoadoutMusicianId = Musician Id +character-item-group-LoadoutMusicianNeck = Musician Neckwear +character-item-group-LoadoutMusicianMask = Musician Masks +character-item-group-LoadoutMusicianOuter = Musician Outerwear +character-item-group-LoadoutMusicianShoes = Musician Shoes +character-item-group-LoadoutMusicianUniforms = Musician Uniforms + +# Service - Reporter +character-item-group-LoadoutReporterBackpacks = Reporter Backpacks +character-item-group-LoadoutReporterBelt = Reporter Belt +character-item-group-LoadoutReporterEars = Reporter Ears +character-item-group-LoadoutReporterEquipment = Reporter Equipment +character-item-group-LoadoutReporterEyes = Reporter Eyewear +character-item-group-LoadoutReporterGloves = Reporter Gloves +character-item-group-LoadoutReporterHead = Reporter Headgear +character-item-group-LoadoutReporterId = Reporter Id +character-item-group-LoadoutReporterNeck = Reporter Neckwear +character-item-group-LoadoutReporterMask = Reporter Masks +character-item-group-LoadoutReporterOuter = Reporter Outerwear +character-item-group-LoadoutReporterShoes = Reporter Shoes +character-item-group-LoadoutReporterUniforms = Reporter Uniforms # Traits - Languages character-item-group-TraitsLanguagesBasic = Basic Languages diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa deleted file mode 100644 index c8febb71cff..00000000000 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/aaaaaaaaaaa +++ /dev/null @@ -1,64 +0,0 @@ -- type: characterItemGroup - id: LoadoutCommandBackpacks - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandBelt - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandEars - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandEquipment - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandEyes - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandGloves - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandHead - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandId - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandNeck - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandMask - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandOuter - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandShoes - maxItems: 1 - items: - -- type: characterItemGroup - id: LoadoutCommandUniforms - maxItems: 1 - items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml index c3828ab269c..cd64d44e951 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml @@ -81,10 +81,10 @@ - type: loadout id: LoadoutCommandCapHatBeret -- type: characterItemGroup - id: LoadoutCaptainId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCaptainId +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutCaptainNeck diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml index 978cafe1bb6..c20e6dd322d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml @@ -1,22 +1,23 @@ -- type: characterItemGroup - id: LoadoutCommandBackpacks - maxItems: 1 - items: +# All Command +#- type: characterItemGroup +# id: LoadoutCommandBackpacks +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandBelt - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandBelt +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandEars +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandEquipment - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandEquipment +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutCommandSelfDefense @@ -31,47 +32,47 @@ - type: loadout id: LoadoutCommandFlash -- type: characterItemGroup - id: LoadoutCommandEyes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandEyes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandGloves - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandGloves +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandHead - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandHead +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandId +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandNeck - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandNeck +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandMask - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandMask +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandOuter - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandOuter +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandShoes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandShoes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCommandUniforms - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCommandUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml index 0b2bab129f2..25015ee0d3c 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml @@ -20,15 +20,15 @@ - type: loadout id: LoadoutHeadOfPersonnelBeltClipboard -- type: characterItemGroup - id: LoadoutHeadOfPersonnelEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutHeadOfPersonnelEars +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutHeadOfPersonnelEquipment - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutHeadOfPersonnelEquipment +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutHeadOfPersonnelTrinkets @@ -39,10 +39,10 @@ - type: loadout id: LoadoutHeadOfPersonnelBookIanDossier -- type: characterItemGroup - id: LoadoutHeadOfPersonnelEyes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutHeadOfPersonnelEyes +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutHeadOfPersonnelGloves @@ -60,10 +60,10 @@ - type: loadout id: LoadoutCommandHOPHatCap -- type: characterItemGroup - id: LoadoutHeadOfPersonnelId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutHeadOfPersonnelId +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutHeadOfPersonnelNeck @@ -78,10 +78,10 @@ - type: loadout id: LoadoutHeadOfPersonnelNeckGoldMedal -- type: characterItemGroup - id: LoadoutHeadOfPersonnelMask - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutHeadOfPersonnelMask +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutHeadOfPersonnelOuter diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml index 5cfe6d392ba..27890a2827d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml @@ -18,10 +18,10 @@ - type: loadout id: LoadoutAtmosphericTechnicianBeltUtilityAtmos -- type: characterItemGroup - id: LoadoutAtmosphericTechnicianEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutAtmosphericTechnicianEars +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutAtmosphericTechnicianEquipment @@ -34,15 +34,15 @@ - type: loadout id: LoadoutAtmosphericTechnicianEquipmentRCD -- type: characterItemGroup - id: LoadoutAtmosphericTechnicianEyes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutAtmosphericTechnicianEyes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutAtmosphericTechnicianGloves - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutAtmosphericTechnicianGloves +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutAtmosphericTechnicianHead @@ -51,15 +51,15 @@ - type: loadout id: LoadoutAtmosphericTechnicianChickenhead -- type: characterItemGroup - id: LoadoutAtmosphericTechnicianId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutAtmosphericTechnicianId +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutAtmosphericTechnicianNeck - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutAtmosphericTechnicianNeck +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutAtmosphericTechnicianMask diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml index 215f77f153d..e36ad8935ab 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml @@ -18,10 +18,10 @@ - type: loadout id: LoadoutChiefEngineerBeltFilled -- type: characterItemGroup - id: LoadoutChiefEngineerEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutChiefEngineerEars +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutChiefEngineerEquipment @@ -36,25 +36,25 @@ - type: loadout id: LoadoutChiefEngineerEquipmentRCDAmmoSpare -- type: characterItemGroup - id: LoadoutChiefEngineerEyes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutChiefEngineerEyes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutChiefEngineerGloves - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutChiefEngineerGloves +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutChiefEngineerHead - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutChiefEngineerHead +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutChiefEngineerId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutChiefEngineerId +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutChiefEngineerNeck @@ -67,10 +67,10 @@ - type: loadout id: LoadoutEngineeringChiefEngineerNeckEngineerMedal -- type: characterItemGroup - id: LoadoutChiefEngineerMask - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutChiefEngineerMask +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutChiefEngineerOuter diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml index 214871a0db8..c962e83dd19 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml @@ -1,3 +1,4 @@ +# All Engineering - type: characterItemGroup id: LoadoutEngineeringBackpacks maxItems: 1 @@ -9,15 +10,26 @@ - type: loadout id: LoadoutBackpackDuffelEngineering +#- type: characterItemGroup +# id: LoadoutEngineeringBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEngineeringEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEngineeringEquipment +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutEngineeringUniforms + id: LoadoutEyesEngineering items: - type: loadout - id: LoadoutEngineeringUniformSuit - - type: loadout - id: LoadoutEngineeringUniformSkirt - - type: loadout - id: LoadoutEngineeringUniformHazard + id: LoadoutEngineeringEyesMeson - type: characterItemGroup id: LoadoutEngineeringGloves @@ -30,12 +42,6 @@ - type: loadout id: LoadoutEngineeringGlovesMerc -- type: characterItemGroup - id: LoadoutOuterEngineering - items: - - type: loadout - id: LoadoutEngineeringOuterHazard - - type: characterItemGroup id: LoadoutHeadEngineering items: @@ -52,8 +58,38 @@ - type: loadout id: LoadoutEngineeringHeadHardhatYellow +#- type: characterItemGroup +# id: LoadoutEngineeringId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEngineeringNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEngineeringMask +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutEyesEngineering + id: LoadoutOuterEngineering items: - type: loadout - id: LoadoutEngineeringEyesMeson + id: LoadoutEngineeringOuterHazard + +#- type: characterItemGroup +# id: LoadoutEngineeringShoes +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutEngineeringUniforms + items: + - type: loadout + id: LoadoutEngineeringUniformSuit + - type: loadout + id: LoadoutEngineeringUniformSkirt + - type: loadout + id: LoadoutEngineeringUniformHazard diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml index 13e431fe9bf..965ba118135 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/seniorEngineer.yml @@ -1,7 +1,7 @@ -- type: characterItemGroup - id: LoadoutSeniorEngineerBackpacks - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerBackpacks +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutSeniorEngineerBelt @@ -14,10 +14,10 @@ - type: loadout id: LoadoutSeniorEngineerBeltUtilityAtmos -- type: characterItemGroup - id: LoadoutSeniorEngineerEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerEars +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutSeniorEngineerEquipment @@ -30,45 +30,45 @@ - type: loadout id: LoadoutSeniorEngineerEquipmentRCD -- type: characterItemGroup - id: LoadoutSeniorEngineerEyes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerEyes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutSeniorEngineerGloves - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerGloves +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutSeniorEngineerHead - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerHead +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutSeniorEngineerId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerId +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutSeniorEngineerNeck - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerNeck +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutSeniorEngineerMask - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerMask +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutSeniorEngineerOuter - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerOuter +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutSeniorEngineerShoes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutSeniorEngineerShoes +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutSeniorEngineerUniforms diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml index 14ea3ff0837..7a7468e9b94 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/stationEngineer.yml @@ -1,17 +1,17 @@ -- type: characterItemGroup - id: LoadoutStationEngineerBackpacks - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerBackpacks +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerBelt - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerBelt +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerEars +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutStationEngineerEquipment @@ -22,47 +22,47 @@ - type: loadout id: LoadoutStationEngineerEquipmentRCD -- type: characterItemGroup - id: LoadoutStationEngineerEyes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerEyes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerGloves - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerGloves +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerHead - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerHead +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerId +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerNeck - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerNeck +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerMask - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerMask +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerOuter - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerOuter +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerShoes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerShoes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutStationEngineerUniforms - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutStationEngineerUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml index 74c70b573d0..746a4025b7b 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/technicalAssistant.yml @@ -1,64 +1,64 @@ -- type: characterItemGroup - id: LoadoutTechnicalAssistantBackpacks - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantBackpacks +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantBelt - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantBelt +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantEars +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantEquipment - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantEquipment +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantEyes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantEyes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantGloves - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantGloves +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantHead - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantHead +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantId - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantId +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantNeck - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantNeck +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantMask - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantMask +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantOuter - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantOuter +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantShoes - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantShoes +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutTechnicalAssistantUniforms - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutTechnicalAssistantUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/acolyte.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/acolyte.yml index e69de29bb2d..9a4a9fc2237 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/acolyte.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/acolyte.yml @@ -0,0 +1,64 @@ +#- type: characterItemGroup +# id: LoadoutAcolyteBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutAcolyteUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml index ded12b6b342..765764b7cbb 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/cataloger.yml @@ -1,6 +1,66 @@ -# Cataloguer +# Cataloger +#- type: characterItemGroup +# id: LoadoutCatalogerBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCatalogerShoes +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutCataloguerUniforms + id: LoadoutCatalogerUniforms items: - type: loadout id: LoadoutScienceJumpsuitLibrarianNt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml index a6985002190..c993095356d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml @@ -1,18 +1,73 @@ # Chaplain +#- type: characterItemGroup +# id: LoadoutChaplainBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainEars +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutChaplainUniforms - maxItems: 1 + id: LoadoutChaplainEquipment + maxItems: 2 items: - type: loadout - id: LoadoutChaplainJumpsuit + id: LoadoutChaplainBible - type: loadout - id: LoadoutChaplainJumpskirt + id: LoadoutChaplainStamp +#- type: characterItemGroup +# id: LoadoutChaplainEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChaplainShoes +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutChaplainEquipment - maxItems: 2 + id: LoadoutChaplainUniforms + maxItems: 1 items: - type: loadout - id: LoadoutChaplainBible + id: LoadoutChaplainJumpsuit - type: loadout - id: LoadoutChaplainStamp + id: LoadoutChaplainJumpskirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml index 142c23b155f..1597c1c0b51 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/golemancer.yml @@ -1,3 +1,64 @@ +# Golemancer +#- type: characterItemGroup +# id: LoadoutGolemancerBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutGolemancerShoes +# maxItems: 1 +# items: +# - type: characterItemGroup id: LoadoutGolemancerUniforms maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml index bef41d9466c..c868447b9ce 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml @@ -10,15 +10,31 @@ - type: loadout id: LoadoutMystagogueBackpacksDuffel -- type: characterItemGroup - id: LoadoutMystagogueOuter - maxItems: 1 - items: - - type: loadout - id: LoadoutCommandRDOuterWinter - - type: loadout - id: LoadoutCommandRDOuterMysta - +#- type: characterItemGroup +# id: LoadoutMystagogueBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMystagogueEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMystagogueEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMystagogueEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMystagogueGloves +# maxItems: 1 +# items: +# - type: characterItemGroup id: LoadoutMystagogueHead maxItems: 1 @@ -28,6 +44,11 @@ - type: loadout id: LoadoutCommandRDHeadHoodMysta +#- type: characterItemGroup +# id: LoadoutMystagogueId +# maxItems: 1 +# items: +# - type: characterItemGroup id: LoadoutMystagogueNeck maxItems: 1 @@ -39,6 +60,20 @@ - type: loadout id: LoadoutCommandRDNeckCloakMystagogue +#- type: characterItemGroup +# id: LoadoutMystagogueMask +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutMystagogueOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandRDOuterWinter + - type: loadout + id: LoadoutCommandRDOuterMysta + - type: characterItemGroup id: LoadoutMystagogueShoes maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml index b646915ab2b..1e2c5c85a52 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystic.yml @@ -1,15 +1,71 @@ +# Mystic +#- type: characterItemGroup +# id: LoadoutMysticBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMysticMask +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutMysticUniforms + id: LoadoutMysticOuter maxItems: 1 items: - type: loadout - id: LoadoutScienceUniformJumpskirtSenior - - type: loadout - id: LoadoutScienceUniformJumpsuitSenior + id: LoadoutScienceOuterLabcoatSeniorResearcher +#- type: characterItemGroup +# id: LoadoutMysticShoes +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutMysticOuter + id: LoadoutMysticUniforms maxItems: 1 items: - type: loadout - id: LoadoutScienceOuterLabcoatSeniorResearcher + id: LoadoutScienceUniformJumpskirtSenior + - type: loadout + id: LoadoutScienceUniformJumpsuitSenior diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/noviciate.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/noviciate.yml index e69de29bb2d..d7b6f1224b8 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/noviciate.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/noviciate.yml @@ -0,0 +1,65 @@ +# Noviciate +#- type: characterItemGroup +# id: LoadoutNoviciateBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutNoviciateUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml index e69de29bb2d..f8941e804e1 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml @@ -0,0 +1,65 @@ +# Psionic Mantis +#- type: characterItemGroup +# id: LoadoutPsionicMantisBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsionicMantisUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml index 50a637446bd..3630e249032 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml @@ -1,96 +1,66 @@ -- type: characterItemGroup - id: LoadoutUniformsScience - items: - - type: loadout - id: LoadoutScienceUniformJumpsuitMonasticRobeDark - - type: loadout - id: LoadoutScienceUniformJumpsuitMonasticRobeLight - -- type: characterItemGroup - id: LoadoutOuterScience - items: - - type: loadout - id: LoadoutScienceOuterCoat - - type: loadout - id: LoadoutScienceOuterLabcoat - - type: loadout - id: LoadoutSciencegOuterCoatRobo - - type: loadout - id: LoadoutScienceOuterWinterSci - - type: loadout - id: LoadoutScienceOuterLabcoatSeniorResearcher - - type: loadout - id: LoadoutScienceOuterExplorerLabcoat - - type: loadout - id: LoadoutOuterRobeTechPriest - - type: loadout - id: LoadoutOuterPlagueSuit - - type: loadout - id: LoadoutOuterNunRobe - - type: loadout - id: LoadoutOuterHoodieBlack - - type: loadout - id: LoadoutOuterHoodieChaplain - - type: loadout - id: LoadoutScienceOuterWinterCoatMantis - -- type: characterItemGroup - id: LoadoutGlovesScience - items: - - type: loadout - id: LoadoutScienceHandsGlovesColorPurple - - type: loadout - id: LoadoutScienceHandsGlovesLatex - - type: loadout - id: LoadoutScienceHandsGlovesRobohands - -- type: characterItemGroup - id: LoadoutNeckScience - items: - - type: loadout - id: LoadoutScienceNeckTieSci - - type: loadout - id: LoadoutScienceNeckScarfStripedPurple - - type: loadout - id: LoadoutScienceNeckStoleChaplain - - type: loadout - id: LoadoutScienceNeckScarfStripedBlack - -- type: characterItemGroup - id: LoadoutMaskScience - items: - - type: loadout - id: LoadoutScienceMaskPlague - -- type: characterItemGroup - id: LoadoutHeadScience - items: - - type: loadout - id: LoadoutScienceHeadHatBeret - - type: loadout - id: LoadoutHeadHoodTechPriest - - type: loadout - id: LoadoutScienceHeadHatFez - - type: loadout - id: LoadoutScienceHeadHatHoodNunHood - - type: loadout - id: LoadoutScienceHeadHatPlaguedoctor - - type: loadout - id: LoadoutScienceHeadHatWitch - - type: loadout - id: LoadoutScienceHeadHatWitch1 - -- type: characterItemGroup - id: LoadoutEyesScience - items: - - type: loadout - id: LoadoutScienceEyesHudDiagnostic - - type: loadout - id: LoadoutScienceEyesEyepatchHudDiag - -- type: characterItemGroup - id: LoadoutShoesScience - items: - - type: loadout - id: LoadoutScienceShoesBootsWinterSci - +# All Epistemics +#- type: characterItemGroup +# id: LoadoutEpistemicsBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutEpistemicsShoes +# items: +# - type: loadout +# id: LoadoutScienceShoesBootsWinterSci +# +#- type: characterItemGroup +# id: LoadoutEpistemicsUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml index 5f4716f7fd5..872e6a38ef2 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/cargoTechnician.yml @@ -1,3 +1,54 @@ +# Cargo Technician +#- type: characterItemGroup +# id: LoadoutCargoTechnicianBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCargoTechnicianMask +# maxItems: 1 +# items: +# - type: characterItemGroup id: LoadoutCargoTechnicianOuter maxItems: 1 @@ -11,3 +62,8 @@ items: - type: loadout id: LoadoutCargoShoesBootsWinterCargo + +#- type: characterItemGroup +# id: LoadoutCargoTechnicianUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/courier.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/courier.yml index e69de29bb2d..cb52d012a55 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/courier.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/courier.yml @@ -0,0 +1,65 @@ +# Courier +#- type: characterItemGroup +# id: LoadoutCourierBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCourierUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml index e69de29bb2d..758f5ae0f15 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml @@ -0,0 +1,65 @@ +# Logistics Officer +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOfficerUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml index eaaf958db78..69c53c20f19 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml @@ -1,3 +1,4 @@ +# Salvage Specialist - type: characterItemGroup id: LoadoutSalvageSpecialistBackpacks maxItems: 1 @@ -5,6 +6,21 @@ - type: loadout id: LoadoutBackpackSalvage +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistEquipment +# maxItems: 1 +# items: + - type: characterItemGroup id: LoadoutSalvageSpecialistWeapons maxItems: 1 @@ -12,6 +28,26 @@ - type: loadout id: LoadoutCargoWeaponsCrusherDagger +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistId +# maxItems: 1 +# items: +# - type: characterItemGroup id: LoadoutSalvageSpecialistNeck maxItems: 1 @@ -19,9 +55,24 @@ - type: loadout id: LoadoutCargoNeckGoliathCloak +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistMask +# maxItems: 1 +# items: +# - type: characterItemGroup id: LoadoutSalvageSpecialistOuter maxItems: 1 items: - type: loadout id: LoadoutCargoOuterWinterMiner + +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSalvageSpecialistUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml index e69de29bb2d..9edc0fe4451 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml @@ -0,0 +1,65 @@ +# All Logistics +#- type: characterItemGroup +# id: LoadoutLogisticsBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLogisticsUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml index e69de29bb2d..2760cc32b31 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml @@ -0,0 +1,65 @@ +# Chemist +#- type: characterItemGroup +# id: LoadoutChemistBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChemistUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml index e69de29bb2d..2e3a2bd09d4 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml @@ -0,0 +1,65 @@ +# Chief Medical Officer +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChiefMedicalOfficerUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml index e69de29bb2d..9e5f61518b1 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml @@ -0,0 +1,65 @@ +# Medical Doctor +#- type: characterItemGroup +# id: LoadoutMedicalDoctorBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalDoctorUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml index e69de29bb2d..254e61ffbfd 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml @@ -0,0 +1,65 @@ +# Medical Intern +#- type: characterItemGroup +# id: LoadoutMedicalInternBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalInternUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml index e69de29bb2d..367a18bd3a3 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml @@ -0,0 +1,65 @@ +# Paramedic +#- type: characterItemGroup +# id: LoadoutParamedicBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutParamedicUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml index e69de29bb2d..2a832138376 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml @@ -0,0 +1,65 @@ +# Senior Physician +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorPhysicianUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml index 396f07290fb..8ddf8b156fb 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml @@ -1,101 +1,65 @@ -- type: characterItemGroup - id: LoadoutUniformsMedical - items: - - type: loadout - id: LoadoutMedicalUniformScrubsBlue - - type: loadout - id: LoadoutMedicalUniformScrubsGreen - - type: loadout - id: LoadoutMedicalUniformScrubsPurple - - type: loadout - id: LoadoutMedicalUniformScrubsCyan - - type: loadout - id: LoadoutMedicalUniformScrubsBlack - - type: loadout - id: LoadoutMedicalUniformScrubsPink - - type: loadout - id: LoadoutMedicalUniformScrubsCybersun - - type: loadout - id: LoadoutMedicalUniformParamedicJumpsuit - - type: loadout - id: LoadoutMedicalUniformParamedicJumpskirt - - type: loadout - id: LoadoutMedicalUniformJumpskirtSenior - - type: loadout - id: LoadoutMedicalUniformJumpsuitSenior - - type: loadout - id: LoadoutMedicalUniformJumpsuitChemShirt - -- type: characterItemGroup - id: LoadoutOuterMedical - items: - - type: loadout - id: LoadoutMedicalOuterLabcoat - - type: loadout - id: LoadoutMedicalOuterCybersunWindbreaker - - type: loadout - id: LoadoutMedicalOuterLabcoatChem - - type: loadout - id: LoadoutMedicalOuterApronChemist - -- type: characterItemGroup - id: LoadoutGlovesMedical - items: - - type: loadout - id: LoadoutMedicalGlovesNitrile - - type: loadout - id: LoadoutMedicalHandsGlovesChemist - -- type: characterItemGroup - id: LoadoutNeckMedical - items: - - type: loadout - id: LoadoutMedicalNeckStethoscope - - type: loadout - id: LoadoutMedicalBedsheetMedical - - type: loadout - id: LoadoutMedicalNeckTieChem - -- type: characterItemGroup - id: LoadoutHeadMedical - items: - - type: loadout - id: LoadoutMedicalHeadNurse - - type: loadout - id: LoadoutMedicalHeadBeretSeniorPhysician - - type: loadout - id: LoadoutMedicalHeadSurgcapBlue - - type: loadout - id: LoadoutMedicalHeadSurgcapPurple - - type: loadout - id: LoadoutMedicalHeadSurgcapGreen - - type: loadout - id: LoadoutMedicalHeadSurgcapCyan - - type: loadout - id: LoadoutMedicalHeadSurgcapBlack - - type: loadout - id: LoadoutMedicalHeadSurgcapPink - - type: loadout - id: LoadoutMedicalHeadSurgcapWhite - - type: loadout - id: LoadoutMedicalHeadSurgcapCybersun - -- type: characterItemGroup - id: LoadoutEyesMedical - items: - - type: loadout - id: LoadoutMedicalEyesHudMedical - - type: loadout - id: LoadoutMedicalEyesEyepatchHudMedical - - type: loadout - id: LoadoutMedicalEyesHudMedicalPrescription - - type: loadout - id: LoadoutMedicalEyesGlassesChemical - - type: loadout - id: LoadoutMedicalEyesGlassesChemist - -- type: characterItemGroup - id: LoadoutShoesMedical - items: - - type: loadout - id: LoadoutMedicalShoesEnclosedChem +# All Medical +#- type: characterItemGroup +# id: LoadoutMedicalBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMedicalUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/cadet.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/cadet.yml index e69de29bb2d..3945c80e622 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/cadet.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/cadet.yml @@ -0,0 +1,65 @@ +# Cadet +#- type: characterItemGroup +# id: LoadoutCadetBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCadetUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml index e69de29bb2d..46b294c559d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml @@ -0,0 +1,65 @@ +# Corpsman +#- type: characterItemGroup +# id: LoadoutCorpsmanBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutCorpsmanUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml index e69de29bb2d..c81472ad337 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml @@ -0,0 +1,65 @@ +# Detective +#- type: characterItemGroup +# id: LoadoutDetectiveBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutDetectiveUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml index e69de29bb2d..e400628d59f 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml @@ -0,0 +1,84 @@ +# Head Of Security +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityEquipment +# maxItems: 1 +# items: + +- type: characterItemGroup + maxItems: 1 + id: LoadoutHoSWeapon + items: + - type: loadout + id: LoadoutCommandHoSPulsePistol + - type: loadout + id: LoadoutCommandHoSWt550 + - type: loadout + id: LoadoutCommandHoSKatanaSheath + - type: loadout + id: LoadoutCommandHoSC20r + - type: loadout + id: LoadoutCommandHoSBulldog + - type: loadout + id: LoadoutCommandHoSEnergySword + - type: loadout + id: LoadoutCommandHoSEnergyGun + +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutHeadOfSecurityUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/securityOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/securityOfficer.yml index e69de29bb2d..0c43a1f18d6 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/securityOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/securityOfficer.yml @@ -0,0 +1,65 @@ +# Security Officer +#- type: characterItemGroup +# id: LoadoutSecurityOfficerBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOfficerUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml index 12164e9a986..96761a12e51 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/seniorOfficer.yml @@ -1,3 +1,64 @@ +# Senior Officer +#- type: characterItemGroup +# id: LoadoutSeniorOfficerBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSeniorOfficerShoes +# maxItems: 1 +# items: +# - type: characterItemGroup id: LoadoutSeniorOfficerUniforms items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index 58695b6b1e7..e3edc5382b2 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -1,112 +1,22 @@ -- type: characterItemGroup - id: LoadoutUniformsSecurity - items: - - type: loadout - id: LoadoutSecurityUniformJumpsuitBlue - - type: loadout - id: LoadoutSecurityUniformJumpskirtBlue - - type: loadout - id: LoadoutSecurityUniformJumpsuitGrey - - type: loadout - id: LoadoutSecurityUniformJumpskirtGrey - - type: loadout - id: LoadoutUniformJumpsuitSecFormal - - type: loadout - id: LoadoutUniformJumpsuitSecSummer - -- type: characterItemGroup - id: LoadoutOuterSecurity - items: - - type: loadout - id: LoadoutClothingOuterArmorPlateCarrier - - type: loadout - id: LoadoutClothingOuterArmorDuraVest - - type: loadout - id: LoadoutClothingOuterCoatDetective - - type: loadout - id: LoadoutOuterVestDetective - - type: loadout - id: LoadoutClothingOuterArmorBasic - - type: loadout - id: LoadoutClothingOuterArmorSlim - -- type: characterItemGroup - id: LoadoutGlovesSecurity - items: - - type: loadout - id: LoadoutClothingHandsGlovesNitrile - -- type: characterItemGroup - id: LoadoutNeckSecurity - items: - - type: loadout - id: LoadoutClothingNeckCloakHos - - type: loadout - id: LoadoutClothingNeckMantleHOS - - type: loadout - id: LoadoutBedsheetBrigmedic - -- type: characterItemGroup - id: LoadoutHeadSecurity - items: - - type: loadout - id: LoadoutSecurityHeadHatBeret - - type: loadout - id: LoadoutClothingHeadHelmetBasic - - type: loadout - id: LoadoutClothingHeadHatBeretBrigmedic - - type: loadout - id: LoadoutClothingHeadHatBeretCorpsman - - type: loadout - id: LoadoutClothingHeadHatBeretWarden - - type: loadout - id: LoadoutClothingHeadHatBeretHoS - - type: loadout - id: LoadoutClothingHeadHelmetInsulated - -- type: characterItemGroup - id: LoadoutMaskSecurity - items: - - type: loadout - id: LoadoutSecurityMaskGasSwat - -- type: characterItemGroup - id: LoadoutBeltSecurity - items: - - type: loadout - id: LoadoutSecurityBeltWebbing - - type: loadout - id: LoadoutClothingBeltCorpsmanWebbing - - type: loadout - id: LoadoutClothingBeltSecurity - - type: loadout - id: LoadoutClothingBeltHolster - -- type: characterItemGroup - id: LoadoutEyesSecurity - items: - - type: loadout - id: LoadoutSecurityEyesHudSecurity - - type: loadout - id: ClothingEyesGlassesSunglasses - - type: loadout - id: LoadoutSecurityEyesEyepatchHudSecurity - - type: loadout - id: LoadoutSecurityEyesHudSecurityPrescription - - type: loadout - id: LoadoutClothingEyesGlassesSecurity - -- type: characterItemGroup - id: LoadoutShoesSecurity - items: - - type: loadout - id: LoadoutSecurityShoesJackboots - - type: loadout - id: LoadoutClothingShoesBootsCombat - +# All Security +#- type: characterItemGroup +# id: LoadoutSecurityBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityEars +# maxItems: 1 +# items: +# - type: characterItemGroup maxItems: 5 - id: LoadoutEquipmentSecurity + id: LoadoutSecurityEquipment items: - type: loadout id: LoadoutSecurityCombatKnife @@ -139,7 +49,7 @@ - type: characterItemGroup maxItems: 1 - id: LoadoutWeaponSecurity + id: LoadoutSecurityWeapons items: - type: loadout id: LoadoutSecurityDisabler @@ -194,32 +104,47 @@ - type: loadout id: LoadoutSecurityRevolverPythonNonlethal -- type: characterItemGroup - maxItems: 1 - id: LoadoutBackSecurity - items: - - type: loadout - id: LoadoutClothingBackSecurity - - type: loadout - id: LoadoutClothingBackSecuritySatchel - - type: loadout - id: LoadoutClothingBackSecurityDuffel - -- type: characterItemGroup - maxItems: 1 - id: LoadoutHoSWeapon - items: - - type: loadout - id: LoadoutCommandHoSPulsePistol - - type: loadout - id: LoadoutCommandHoSWt550 - - type: loadout - id: LoadoutCommandHoSKatanaSheath - - type: loadout - id: LoadoutCommandHoSC20r - - type: loadout - id: LoadoutCommandHoSBulldog - - type: loadout - id: LoadoutCommandHoSEnergySword - - type: loadout - id: LoadoutCommandHoSEnergyGun +#- type: characterItemGroup +# id: LoadoutSecurityEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutSecurityUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml index d02642a9327..63738189a8e 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml @@ -1,11 +1,65 @@ -- type: characterItemGroup - id: LoadoutWardenUniforms - items: - - type: loadout - id: LoadoutUniformJumpsuitWardenBlue - - type: loadout - id: LoadoutUniformJumpsuitWardenGrey - - type: loadout - id: LoadoutUniformJumpskirtWardenBlue - - type: loadout - id: LoadoutUniformJumpskirtWardenGrey +# Warden +#- type: characterItemGroup +# id: LoadoutWardenBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutWardenUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml index e69de29bb2d..46bf825f227 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml @@ -0,0 +1,94 @@ +# Bartender +#- type: characterItemGroup +# id: LoadoutBartenderBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBartenderBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBartenderEars +# maxItems: 1 +# items: +# + +- type: characterItemGroup + id: LoadoutBartenderAmmo + items: + - type: loadout + id: LoadoutServiceBartenderBoxBeanbags + - type: loadout + id: LoadoutServiceBartenderBoxLightRifleRubber + +- type: characterItemGroup + id: LoadoutBartenderWeapon + items: + - type: loadout + id: LoadoutServiceBartenderShotgunDoubleBarreledRubber + - type: loadout + id: LoadoutServiceBartenderMosinRubber + +#- type: characterItemGroup +# id: LoadoutBartenderEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBartenderGloves +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutBartenderHead + items: + - type: loadout + id: LoadoutServiceHeadBartenderNt + - type: loadout + id: LoadoutServiceHeadBartenderIdris + - type: loadout + id: LoadoutServiceHeadBartenderOrion + +#- type: characterItemGroup +# id: LoadoutBartenderId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBartenderNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBartenderMask +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutBartenderOuter + items: + - type: loadout + id: LoadoutServiceBartenderArmorDuraVest + - type: loadout + id: LoadoutServiceOuterBartenderNt + - type: loadout + id: LoadoutServiceOuterBartenderIdris + - type: loadout + id: LoadoutServiceOuterBartenderOrion + +#- type: characterItemGroup +# id: LoadoutBartenderShoes +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutBartenderUniforms + items: + - type: loadout + id: LoadoutServiceJumpsuitBartenderNt + - type: loadout + id: LoadoutServiceJumpsuitBartenderIdris + - type: loadout + id: LoadoutServiceJumpsuitBartenderOrion diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml new file mode 100644 index 00000000000..2436bf0abc4 --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml @@ -0,0 +1,64 @@ +#- type: characterItemGroup +# id: LoadoutBotanistBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutBotanistUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/chef.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/chef.yml index e69de29bb2d..e6161bcf207 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/chef.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/chef.yml @@ -0,0 +1,80 @@ +# Chef +#- type: characterItemGroup +# id: LoadoutChefBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChefBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChefEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChefEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChefEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChefGloves +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutChefHead + items: + - type: loadout + id: LoadoutServiceHeadChefNt + - type: loadout + id: LoadoutServiceHeadChefIdris + - type: loadout + id: LoadoutServiceHeadChefOrion + +#- type: characterItemGroup +# id: LoadoutChefId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChefNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutChefMask +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutChefOuter + items: + - type: loadout + id: LoadoutServiceOuterChefNt + - type: loadout + id: LoadoutServiceOuterChefIdris + - type: loadout + id: LoadoutServiceOuterChefOrion + +#- type: characterItemGroup +# id: LoadoutChefShoes +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutChefUniforms + items: + - type: loadout + id: LoadoutServiceJumpsuitChefNt + - type: loadout + id: LoadoutServiceJumpsuitChefIdris + - type: loadout + id: LoadoutServiceJumpsuitChefOrion diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml index e69de29bb2d..772fea26ec6 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml @@ -0,0 +1,65 @@ +# Clown +#- type: characterItemGroup +# id: LoadoutClownBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutClownUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml index e69de29bb2d..d849ba95824 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml @@ -0,0 +1,65 @@ +# Janitor +#- type: characterItemGroup +# id: LoadoutJanitorBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJanitorUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml index e69de29bb2d..5215929aca9 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml @@ -0,0 +1,65 @@ +# Lawyer +#- type: characterItemGroup +# id: LoadoutLawyerBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutLawyerUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml index e69de29bb2d..2dbc03c152c 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml @@ -0,0 +1,65 @@ +# Mime +#- type: characterItemGroup +# id: LoadoutMimeBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMimeUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/musician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/musician.yml index eac816b8db4..90943d47950 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/musician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/musician.yml @@ -1,5 +1,21 @@ +# Musician +#- type: characterItemGroup +# id: LoadoutMusicianBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianEars +# maxItems: 1 +# items: +# - type: characterItemGroup - id: LoadoutMusicianInstruments + id: LoadoutMusicianEquipment maxItems: 3 items: # Brass @@ -92,3 +108,48 @@ id: LoadoutItemOcarinaInstrumentMusician - type: loadout id: LoadoutItemBagpipeInstrumentMusician + +#- type: characterItemGroup +# id: LoadoutMusicianEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutMusicianUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml index e69de29bb2d..df023122094 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml @@ -0,0 +1,65 @@ +# Reporter +#- type: characterItemGroup +# id: LoadoutReporterBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutReporterUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml index 61c2b286b7e..17b1eba629f 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml @@ -1,135 +1,73 @@ -- type: characterItemGroup - id: LoadoutUniformsService - items: - - type: loadout - id: LoadoutServiceClownOutfitJester - - type: loadout - id: LoadoutServiceClownOutfitJesterAlt - - type: loadout - id: LoadoutServiceBartenderUniformPurple - - type: loadout - id: LoadoutServiceBotanistUniformOveralls - - type: loadout - id: LoadoutServiceLawyerUniformBlueSuit - - type: loadout - id: LoadoutServiceLawyerUniformBlueSkirt - - type: loadout - id: LoadoutServiceLawyerUniformRedSuit - - type: loadout - id: LoadoutServiceLawyerUniformRedSkirt - - type: loadout - id: LoadoutServiceLawyerUniformPurpleSuit - - type: loadout - id: LoadoutServiceLawyerUniformPurpleSkirt - - type: loadout - id: LoadoutServiceLawyerUniformGoodSuit - - type: loadout - id: LoadoutServiceLawyerUniformGoodSkirt - - type: loadout - id: LoadoutServiceReporterUniformJournalist - - type: loadout - id: LoadoutServiceReporterUniformDetectivesuit - - type: loadout - id: LoadoutServiceReporterUniformDetectiveskirt - -- type: characterItemGroup - id: LoadoutOuterService - items: - - type: loadout - id: LoadoutServiceClownOuterWinter - - type: loadout - id: LoadoutServiceClownOuterClownPriest - - type: loadout - id: LoadoutServiceMimeOuterWinter - -- type: characterItemGroup - id: LoadoutNeckService - items: - - type: loadout - id: LoadoutServiceClownBedsheetClown - - type: loadout - id: LoadoutServiceMimeBedsheetMime - -- type: characterItemGroup - id: LoadoutMaskService - items: - - type: loadout - id: LoadoutServiceClownMaskSexy - - type: loadout - id: LoadoutServiceMimeMaskSad - - type: loadout - id: LoadoutServiceMimeMaskScared - - type: loadout - id: LoadoutServiceMimeMaskSexy - -- type: characterItemGroup - id: LoadoutShoesService - items: - - type: loadout - id: LoadoutServiceClownBootsWinter - - type: loadout - id: LoadoutServiceMimeShoesBootsWinter - -- type: characterItemGroup - id: LoadoutEquipmentService +# All Service +#- type: characterItemGroup +# id: LoadoutServiceBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceEars +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutServiceEquipment items: - type: loadout id: LoadoutServiceClownCowToolboxFilled -- type: characterItemGroup - id: LoadoutHeadService - items: - - type: loadout - id: LoadoutServiceClownCowToolboxFilled +#- type: characterItemGroup +# id: LoadoutServiceEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutServiceUniforms +# maxItems: 1 +# items: -# Bartender -- type: characterItemGroup - id: LoadoutBartenderOuterwear - items: - - type: loadout - id: LoadoutServiceBartenderArmorDuraVest - - type: loadout - id: LoadoutServiceOuterBartenderNt - - type: loadout - id: LoadoutServiceOuterBartenderIdris - - type: loadout - id: LoadoutServiceOuterBartenderOrion - -- type: characterItemGroup - id: LoadoutBartenderAmmo - items: - - type: loadout - id: LoadoutServiceBartenderBoxBeanbags - - type: loadout - id: LoadoutServiceBartenderBoxLightRifleRubber -- type: characterItemGroup - id: LoadoutBartenderWeapon - items: - - type: loadout - id: LoadoutServiceBartenderShotgunDoubleBarreledRubber - - type: loadout - id: LoadoutServiceBartenderMosinRubber -- type: characterItemGroup - id: LoadoutBartenderUniforms - items: - - type: loadout - id: LoadoutServiceJumpsuitBartenderNt - - type: loadout - id: LoadoutServiceJumpsuitBartenderIdris - - type: loadout - id: LoadoutServiceJumpsuitBartenderOrion -- type: characterItemGroup - id: LoadoutBartenderHead - items: - - type: loadout - id: LoadoutServiceHeadBartenderNt - - type: loadout - id: LoadoutServiceHeadBartenderIdris - - type: loadout - id: LoadoutServiceHeadBartenderOrion # Botanist - type: characterItemGroup @@ -142,37 +80,6 @@ - type: loadout id: LoadoutServiceJumpsuitHydroponicsOrion -# Chef -- type: characterItemGroup - id: LoadoutChefUniforms - items: - - type: loadout - id: LoadoutServiceJumpsuitChefNt - - type: loadout - id: LoadoutServiceJumpsuitChefIdris - - type: loadout - id: LoadoutServiceJumpsuitChefOrion - -- type: characterItemGroup - id: LoadoutChefHead - items: - - type: loadout - id: LoadoutServiceHeadChefNt - - type: loadout - id: LoadoutServiceHeadChefIdris - - type: loadout - id: LoadoutServiceHeadChefOrion - -- type: characterItemGroup - id: LoadoutChefOuter - items: - - type: loadout - id: LoadoutServiceOuterChefNt - - type: loadout - id: LoadoutServiceOuterChefIdris - - type: loadout - id: LoadoutServiceOuterChefOrion - # Janitor - type: characterItemGroup id: LoadoutJanitorUniforms @@ -182,4 +89,4 @@ - type: loadout id: LoadoutServiceJumpsuitJanitorIdris - type: loadout - id: LoadoutServiceJumpsuitJanitorOrion \ No newline at end of file + id: LoadoutServiceJumpsuitJanitorOrion diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/jobItemGroupTemplate.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/jobItemGroupTemplate.yml new file mode 100644 index 00000000000..fe7809493d7 --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/jobItemGroupTemplate.yml @@ -0,0 +1,66 @@ +# JOB NAME HERE +# When adding a new job, use this template to fill in the item groups +#- type: characterItemGroup +# id: LoadoutJOBBackpacks +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBEars +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBEquipment +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBShoes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutJOBUniforms +# maxItems: 1 +# items: diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml index 931f5fbc02c..8a161e3e3aa 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/musician.yml @@ -14,7 +14,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -27,7 +27,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -40,7 +40,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -53,7 +53,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -67,7 +67,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -80,7 +80,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -95,7 +95,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -108,7 +108,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -121,7 +121,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -134,7 +134,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -147,7 +147,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -160,7 +160,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -173,7 +173,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -187,7 +187,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -200,7 +200,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -213,7 +213,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -226,7 +226,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -239,7 +239,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -252,7 +252,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -265,7 +265,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -278,7 +278,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -292,7 +292,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -305,7 +305,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -318,7 +318,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -331,7 +331,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -344,7 +344,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -357,7 +357,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -370,7 +370,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -383,7 +383,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -396,7 +396,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -409,7 +409,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -422,7 +422,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -435,7 +435,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -449,7 +449,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -462,7 +462,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -475,7 +475,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -488,7 +488,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -501,7 +501,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -514,7 +514,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -527,7 +527,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -540,7 +540,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician @@ -553,7 +553,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMusicianInstruments + group: LoadoutMusicianEquipment - !type:CharacterJobRequirement jobs: - Musician diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml index fa94fd05655..fe03506dad9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/uncategorized.yml @@ -14,7 +14,7 @@ cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentService + group: LoadoutServiceEquipment - !type:CharacterLogicXorRequirement requirements: - !type:CharacterLogicAndRequirement From fbbe77d597606d0cd2aadcb1786481043abf1807 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 15:57:49 -0500 Subject: [PATCH 20/27] SHOULD be done by now. --- .../jobs/{ => engineering}/engineering.ftl | 6 + .../Locale/en-US/loadouts/jobs/medical.ftl | 3 - .../en-US/loadouts/jobs/medical/medical.ftl | 9 + .../Jobs/Command/captain.yml | 10 +- .../Jobs/Command/headOfPersonnel.yml | 10 +- .../Jobs/Engineering/chiefEngineer.yml | 10 +- .../Engineering/engineeringUncategorized.yml | 4 +- .../Jobs/Epistemics/chaplain.yml | 64 ++++--- .../Jobs/Epistemics/mystagogue.yml | 14 +- .../Jobs/Epistemics/uncategorized.yml | 96 ++++++---- .../Jobs/Logistics/logisticsOfficer.yml | 60 ++++--- .../Jobs/Logistics/salvageSpecialist.yml | 4 + .../Jobs/Logistics/uncategorized.yml | 16 +- .../Jobs/Medical/chemist.yml | 136 +++++++++----- .../Jobs/Medical/chiefMedicalOfficer.yml | 96 ++++++---- .../Jobs/Medical/medicalDoctor.yml | 40 +++-- .../Jobs/Medical/medicalIntern.yml | 14 +- .../Jobs/Medical/paramedic.yml | 12 +- .../Jobs/Medical/psychologist.yml | 83 +++++++++ .../Jobs/Medical/seniorPhysician.yml | 38 ++-- .../Jobs/Medical/uncategorized.yml | 146 +++++++++++---- .../Jobs/Security/corpsman.yml | 66 ++++--- .../Jobs/Security/detective.yml | 14 +- .../Jobs/Security/headOfSecurity.yml | 96 ++++++---- .../Jobs/Security/uncategorized.yml | 132 ++++++++++---- .../Jobs/Security/warden.yml | 40 +++-- .../Jobs/Service/bartender.yml | 2 + .../Jobs/Service/botanist.yml | 16 +- .../Jobs/Service/clown.yml | 78 +++++--- .../Jobs/Service/janitor.yml | 14 +- .../Jobs/Service/lawyer.yml | 24 ++- .../CharacterItemGroups/Jobs/Service/mime.yml | 52 +++--- .../Jobs/Service/reporter.yml | 14 +- .../Jobs/Service/uncategorized.yml | 26 --- .../Jobs/Engineering/uncategorized.yml | 14 +- .../Loadouts/Jobs/Epistemics/cataloger.yml | 18 +- .../Loadouts/Jobs/Epistemics/chaplain.yml | 20 +-- .../Loadouts/Jobs/Epistemics/mystagogue.yml | 16 +- .../Jobs/Epistemics/uncategorized.yml | 36 ++-- .../Jobs/Logistics/logisticsOfficer.yml | 60 ++++--- .../Loadouts/Jobs/Medical/chemist.yml | 43 ++++- .../Loadouts/Jobs/Medical/medicalDoctor.yml | 4 +- .../Loadouts/Jobs/Medical/medicalIntern.yml | 2 +- .../Loadouts/Jobs/Medical/seniorPhysician.yml | 18 +- .../Loadouts/Jobs/Medical/uncategorized.yml | 28 --- .../Loadouts/Jobs/Security/corpsman.yml | 20 +-- .../Loadouts/Jobs/Security/headOfSecurity.yml | 48 ++++- .../Loadouts/Jobs/Security/uncategorized.yml | 166 +++++++++--------- .../Loadouts/Jobs/Security/warden.yml | 4 +- .../Loadouts/Jobs/Service/bartender.yml | 10 +- .../Loadouts/Jobs/Service/botanist.yml | 2 +- .../Prototypes/Loadouts/Jobs/Service/chef.yml | 78 ++++---- .../Loadouts/Jobs/Service/clown.yml | 50 +++--- .../Loadouts/Jobs/Service/lawyer.yml | 32 ++-- .../Prototypes/Loadouts/Jobs/Service/mime.yml | 53 +++--- .../Loadouts/Jobs/Service/reporter.yml | 12 +- 56 files changed, 1372 insertions(+), 807 deletions(-) rename Resources/Locale/en-US/loadouts/jobs/{ => engineering}/engineering.ftl (55%) delete mode 100644 Resources/Locale/en-US/loadouts/jobs/medical.ftl create mode 100644 Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl create mode 100644 Resources/Prototypes/CharacterItemGroups/Jobs/Medical/psychologist.yml diff --git a/Resources/Locale/en-US/loadouts/jobs/engineering.ftl b/Resources/Locale/en-US/loadouts/jobs/engineering/engineering.ftl similarity index 55% rename from Resources/Locale/en-US/loadouts/jobs/engineering.ftl rename to Resources/Locale/en-US/loadouts/jobs/engineering/engineering.ftl index bf00def52e4..ea1e33ac81c 100644 --- a/Resources/Locale/en-US/loadouts/jobs/engineering.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/engineering/engineering.ftl @@ -3,3 +3,9 @@ loadout-description-LoadoutEngineeringChickenSuit = For the Eggmos tech who alwa loadout-description-LoadoutEngineeringUniformJumpskirtSenior = A skirt fit for the best of the best. loadout-description-LoadoutEngineeringUniformJumpsuitSenior = A suit fit for the best of the best. loadout-description-LoadoutEngineeringItemInflatable = A box containing inflatable walls and doors, for quickly patching up breaches. + +loadout-name-LoadoutEngineeringBeltUtility = utility belt (empty) +loadout-name-LoadoutEngineeringBeltUtilityEngineering = utility belt (filled, standard) +loadout-name-LoadoutEngineeringBeltUtilityAtmos = utility belt (filled, Atmospheric Tools) +loadout-description-LoadoutEngineeringBeltUtilityAtmos = + This standard engineering belt includes a holofan emitter, as well as a gas analyzer instead of a multitool. diff --git a/Resources/Locale/en-US/loadouts/jobs/medical.ftl b/Resources/Locale/en-US/loadouts/jobs/medical.ftl deleted file mode 100644 index c016232ceea..00000000000 --- a/Resources/Locale/en-US/loadouts/jobs/medical.ftl +++ /dev/null @@ -1,3 +0,0 @@ -loadout-description-LoadoutMedicalUniformJumpskirtSenior = A skirt fit for the best of the best. -loadout-description-LoadoutMedicalUniformJumpsuitSenior = A suit fit for the best of the best. -loadout-description-LoadoutMedicalHeadBeretSeniorPhysician = A beret fit for the best of the best. diff --git a/Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl b/Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl new file mode 100644 index 00000000000..f810af49a6a --- /dev/null +++ b/Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl @@ -0,0 +1,9 @@ +loadout-description-LoadoutMedicalUniformJumpskirtSenior = A skirt fit for the best of the best. +loadout-description-LoadoutMedicalUniformJumpsuitSenior = A suit fit for the best of the best. +loadout-description-LoadoutMedicalHeadBeretSeniorPhysician = A beret fit for the best of the best. + +loadout-name-LoadoutMedicalBeltMedical = medical belt (empty) +loadout-name-LoadoutMedicalBeltMedicalFilled = medical belt (filled) +loadout-name-LoadoutMedicalBeltMedicalAdvancedFilled = medical belt (filled, advanced) +loadout-description-LoadoutMedicalBeltMedicalAdvancedFilled = + The standard alotment of topical medicines in this pouch have been replaced with their advanced varieties, such as medicated sutures and regenerative mesh. diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml index cd64d44e951..6f937be1916 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml @@ -81,10 +81,12 @@ - type: loadout id: LoadoutCommandCapHatBeret -#- type: characterItemGroup -# id: LoadoutCaptainId -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutCaptainId + maxItems: 1 + items: + - type: loadout + id: LoadoutCaptainNTPDA - type: characterItemGroup id: LoadoutCaptainNeck diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml index 25015ee0d3c..c15099ae6a2 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/headOfPersonnel.yml @@ -60,10 +60,12 @@ - type: loadout id: LoadoutCommandHOPHatCap -#- type: characterItemGroup -# id: LoadoutHeadOfPersonnelId -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutHeadOfPersonnelId + maxItems: 1 + items: + - type: loadout + id: LoadoutHeadOfPersonnelNTPDA - type: characterItemGroup id: LoadoutHeadOfPersonnelNeck diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml index e36ad8935ab..1e8b997987d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/chiefEngineer.yml @@ -51,10 +51,12 @@ # maxItems: 1 # items: -#- type: characterItemGroup -# id: LoadoutChiefEngineerId -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutChiefEngineerId + maxItems: 1 + items: + - type: loadout + id: LoadoutChiefEngineerNTPDA - type: characterItemGroup id: LoadoutChiefEngineerNeck diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml index c962e83dd19..efc045928e0 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml @@ -43,7 +43,7 @@ id: LoadoutEngineeringGlovesMerc - type: characterItemGroup - id: LoadoutHeadEngineering + id: LoadoutEngineeringHead items: - type: loadout id: LoadoutEngineeringHeadBeret @@ -74,7 +74,7 @@ # items: # - type: characterItemGroup - id: LoadoutOuterEngineering + id: LoadoutEngineeringOuter items: - type: loadout id: LoadoutEngineeringOuterHazard diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml index c993095356d..a8861538f8d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/chaplain.yml @@ -33,31 +33,51 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChaplainHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutChaplainHead + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceHeadHatHoodNunHood + - type: loadout + id: LoadoutScienceHeadHatPlaguedoctor + - type: loadout + id: LoadoutScienceHeadHatWitch + - type: loadout + id: LoadoutScienceHeadHatWitch1 + #- type: characterItemGroup # id: LoadoutChaplainId # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChaplainNeck -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChaplainMask -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChaplainOuter -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutChaplainNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceNeckStoleChaplain + +- type: characterItemGroup + id: LoadoutChaplainMask + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceMaskPlague + +- type: characterItemGroup + id: LoadoutChaplainOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceOuterPlagueSuit + - type: loadout + id: LoadoutScienceOuterNunRobe + - type: loadout + id: LoadoutScienceOuterHoodieBlack + - type: loadout + id: LoadoutScienceOuterHoodieChaplain + #- type: characterItemGroup # id: LoadoutChaplainShoes # maxItems: 1 @@ -71,3 +91,7 @@ id: LoadoutChaplainJumpsuit - type: loadout id: LoadoutChaplainJumpskirt + - type: loadout + id: LoadoutScienceUniformJumpsuitMonasticRobeDark + - type: loadout + id: LoadoutScienceUniformJumpsuitMonasticRobeLight diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml index c868447b9ce..4314e3dd9ba 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/mystagogue.yml @@ -44,11 +44,13 @@ - type: loadout id: LoadoutCommandRDHeadHoodMysta -#- type: characterItemGroup -# id: LoadoutMystagogueId -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMystagogueId + maxItems: 1 + items: + - type: loadout + id: LoadoutMystagogueNTPDA + - type: characterItemGroup id: LoadoutMystagogueNeck maxItems: 1 @@ -59,6 +61,8 @@ id: LoadoutCommandRDNeckCloak - type: loadout id: LoadoutCommandRDNeckCloakMystagogue + - type: loadout + id: LoadoutMystagogueNeckSciencemedal #- type: characterItemGroup # id: LoadoutMystagogueMask diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml index 3630e249032..cc49ed1dc97 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml @@ -19,47 +19,81 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutEpistemicsEyes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutEpistemicsGloves -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutEpistemicsHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutEpistemicsEyes + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceEyesHudDiagnostic + - type: loadout + id: LoadoutScienceEyesEyepatchHudDiag + +- type: characterItemGroup + id: LoadoutEpistemicsGloves + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceHandsGlovesColorPurple + - type: loadout + id: LoadoutScienceHandsGlovesLatex + - type: loadout + id: LoadoutScienceHandsGlovesRobohands + +- type: characterItemGroup + id: LoadoutEpistemicsHead + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceHeadHatBeret + - type: loadout + id: LoadoutScienceHeadHatFez + - type: loadout + id: LoadoutHeadHoodTechPriest + #- type: characterItemGroup # id: LoadoutEpistemicsId # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutEpistemicsNeck -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutEpistemicsNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceNeckTieSci + - type: loadout + id: LoadoutScienceNeckScarfStripedPurple + - type: loadout + id: LoadoutScienceNeckScarfStripedBlack + #- type: characterItemGroup # id: LoadoutEpistemicsMask # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutEpistemicsOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutEpistemicsShoes -# items: -# - type: loadout -# id: LoadoutScienceShoesBootsWinterSci -# +- type: characterItemGroup + id: LoadoutEpistemicsOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceOuterCoat + - type: loadout + id: LoadoutScienceOuterLabcoat + - type: loadout + id: LoadoutScienceOuterCoatRobo + - type: loadout + id: LoadoutScienceOuterWinterSci + - type: loadout + id: LoadoutScienceOuterExplorerLabcoat + - type: loadout + id: LoadoutOuterRobeTechPriest + +- type: characterItemGroup + id: LoadoutEpistemicsShoes + items: + - type: loadout + id: LoadoutScienceShoesBootsWinterSci + #- type: characterItemGroup # id: LoadoutEpistemicsUniforms # maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml index 758f5ae0f15..230fd830363 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml @@ -29,21 +29,27 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutLogisticsOfficerHead -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutLogisticsOfficerId -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutLogisticsOfficerNeck -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutLogisticsOfficerHead + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandQMHeadSoft + +- type: characterItemGroup + id: LoadoutLogisticsOfficerId + maxItems: 1 + items: + - type: loadout + id: LoadoutLogisticsOfficerNTPDA + +- type: characterItemGroup + id: LoadoutLogisticsOfficerNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandQMNeckCloak + #- type: characterItemGroup # id: LoadoutLogisticsOfficerMask # maxItems: 1 @@ -54,12 +60,18 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutLogisticsOfficerShoes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutLogisticsOfficerUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutLogisticsOfficerShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandQMShoesBootsWinter + +- type: characterItemGroup + id: LoadoutLogisticsOfficerUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandQMUniformTurtleneck + - type: loadout + id: LoadoutCommandQMUniformTurtleneckSkirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml index 69c53c20f19..7d50ddb004a 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/salvageSpecialist.yml @@ -5,6 +5,10 @@ items: - type: loadout id: LoadoutBackpackSalvage + - type: loadout + id: LoadoutSalvageBackpackSatchel + - type: loadout + id: LoadoutSalvageBackpackDuffel #- type: characterItemGroup # id: LoadoutSalvageSpecialistBelt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml index 9edc0fe4451..eea65b4c411 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/uncategorized.yml @@ -1,9 +1,15 @@ # All Logistics -#- type: characterItemGroup -# id: LoadoutLogisticsBackpacks -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutLogisticsBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutBackpackCargo + - type: loadout + id: LoadoutBackpackSatchelCargo + - type: loadout + id: LoadoutBackpackDuffelCargo + #- type: characterItemGroup # id: LoadoutLogisticsBelt # maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml index 2760cc32b31..016507e0656 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chemist.yml @@ -1,34 +1,68 @@ # Chemist -#- type: characterItemGroup -# id: LoadoutChemistBackpacks -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChemistBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutChemistBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutChemistryBackpackBackpack + - type: loadout + id: LoadoutBackpackSatchelChemistry + - type: loadout + id: LoadoutBackpackDuffelChemistry + +- type: characterItemGroup + id: LoadoutChemistBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutChemistBeltChemBag + #- type: characterItemGroup # id: LoadoutChemistEars # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChemistEquipment -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChemistEyes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChemistGloves -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutChemistEquipment + maxItems: 3 + items: + - type: loadout + id: LoadoutMedicalItemHandLabeler + - type: loadout + id: LoadoutChemistPillCanisterKelotane + - type: loadout + id: LoadoutChemistPillCanisterTricordrazine + - type: loadout + id: LoadoutChemistPillCanisterHyronalin + - type: loadout + id: LoadoutChemistPillCanisterBicaridine + - type: loadout + id: LoadoutChemistPillCanisterDermaline + - type: loadout + id: LoadoutChemistPillCanisterDylovene + - type: loadout + id: LoadoutChemistPillCanisterDexalin + - type: loadout + id: LoadoutChemistPillCanisterSpaceDrugs + +- type: characterItemGroup + id: LoadoutChemistEyes + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalEyesGlassesChemicalBudget + - type: loadout + id: LoadoutMedicalEyesGlassesChemical + - type: loadout + id: LoadoutMedicalEyesGlassesChemist + +- type: characterItemGroup + id: LoadoutChemistGloves + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalHandsGlovesChemist + #- type: characterItemGroup # id: LoadoutChemistHead # maxItems: 1 @@ -39,27 +73,41 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChemistNeck -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutChemistNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalNeckTieChem + #- type: characterItemGroup # id: LoadoutChemistMask # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChemistOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChemistShoes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChemistUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutChemistOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalOuterLabcoatChem + - type: loadout + id: LoadoutMedicalOuterApronChemist + +- type: characterItemGroup + id: LoadoutChemistShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalShoesEnclosedChem + +- type: characterItemGroup + id: LoadoutChemistUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalUniformJumpsuitChemShirt + - type: loadout + id: LoadoutMedicalUniformJumpsuitChemistry + - type: loadout + id: LoadoutMedicalUniformJumpskirtChemistry diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml index 2e3a2bd09d4..6e9bd02b4f6 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml @@ -4,11 +4,15 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChiefMedicalOfficerBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutChiefMedicalOfficerBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutChiefMedicalOfficerBeltMedical + - type: loadout + id: LoadoutChiefMedicalOfficerBeltMedicalAdvancedFilled + #- type: characterItemGroup # id: LoadoutChiefMedicalOfficerEars # maxItems: 1 @@ -29,37 +33,61 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChiefMedicalOfficerHead -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChiefMedicalOfficerId -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChiefMedicalOfficerNeck -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutChiefMedicalOfficerHead + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCMOHatBeret + +- type: characterItemGroup + id: LoadoutChiefMedicalOfficerId + maxItems: 1 + items: + - type: loadout + id: LoadoutChiefMedicalOfficerNTPDA + +- type: characterItemGroup + id: LoadoutChiefMedicalOfficerNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCMONeckMantle + - type: loadout + id: LoadoutCommandCMONeckCloak + - type: loadout + id: LoadoutChiefMedicalOfficerNeckMedalMedical + #- type: characterItemGroup # id: LoadoutChiefMedicalOfficerMask # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutChiefMedicalOfficerOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChiefMedicalOfficerShoes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutChiefMedicalOfficerUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutChiefMedicalOfficerOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCMOOuterWinter + - type: loadout + id: LoadoutCommandCMOOuterLab + +- type: characterItemGroup + id: LoadoutChiefMedicalOfficerShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandCMOShoesBootsWinter + - type: loadout + id: LoadoutChiefMedicalOfficerShoesLaceup + - type: loadout + id: LoadoutChiefMedicalOfficerShoesLeather + +- type: characterItemGroup + id: LoadoutChiefMedicalOfficerUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutChiefMedicalOfficerJumpsuit + - type: loadout + id: LoadoutChiefMedicalOfficerJumpskirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml index 9e5f61518b1..dd93b54e167 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalDoctor.yml @@ -4,11 +4,17 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalDoctorBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalDoctorBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalDoctorBeltMedical + - type: loadout + id: LoadoutMedicalDoctorBeltMedicalFilled + - type: loadout + id: LoadoutMedicalDoctorBeltMedicalAdvancedFilled + #- type: characterItemGroup # id: LoadoutMedicalDoctorEars # maxItems: 1 @@ -29,11 +35,13 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalDoctorHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalDoctorHead + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalHeadNurse + #- type: characterItemGroup # id: LoadoutMedicalDoctorId # maxItems: 1 @@ -59,7 +67,11 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalDoctorUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutMedicalDoctorUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalDoctorJumpsuit + - type: loadout + id: LoadoutMedicalDoctorJumpskirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml index 254e61ffbfd..3db0ef908fa 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/medicalIntern.yml @@ -4,11 +4,15 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalInternBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalInternBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalInternBeltMedical + - type: loadout + id: LoadoutMedicalInternBeltMedicalFilled + #- type: characterItemGroup # id: LoadoutMedicalInternEars # maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml index 367a18bd3a3..7abd4c242fb 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml @@ -59,7 +59,11 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutParamedicUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutParamedicUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalUniformParamedicJumpsuit + - type: loadout + id: LoadoutMedicalUniformParamedicJumpskirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/psychologist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/psychologist.yml new file mode 100644 index 00000000000..80925aef590 --- /dev/null +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/psychologist.yml @@ -0,0 +1,83 @@ +# Psychologist +- type: characterItemGroup + id: LoadoutPsychologistBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutPsychologistBackpackBackpack + - type: loadout + id: LoadoutPsychologistBackpackSatchel + - type: loadout + id: LoadoutPsychologistBackpackDuffel + +#- type: characterItemGroup +# id: LoadoutPsychologistBelt +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistEars +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutPsychologistEquipment + maxItems: 3 + items: + - type: loadout + id: LoadoutPsychologistPillCanisterSpaceDrugs + - type: loadout + id: LoadoutPsychologistPillCanisterPax + - type: loadout + id: LoadoutPsychologistPillCanisterCryptobiolin + - type: loadout + id: LoadoutPsychologistPillCanisterChloralHydrate + +#- type: characterItemGroup +# id: LoadoutPsychologistEyes +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistGloves +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistHead +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistId +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistNeck +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistMask +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistOuter +# maxItems: 1 +# items: +# +#- type: characterItemGroup +# id: LoadoutPsychologistShoes +# maxItems: 1 +# items: +# +- type: characterItemGroup + id: LoadoutPsychologistUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutPsychologistJumpsuit + - type: loadout + id: LoadoutPsychologistJumpskirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml index 2a832138376..c20d2ee50de 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/seniorPhysician.yml @@ -4,11 +4,15 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutSeniorPhysicianBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutSeniorPhysicianBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutSeniorPhysicianBeltMedical + - type: loadout + id: LoadoutSeniorPhysicianBeltMedicalAdvancedFilled + #- type: characterItemGroup # id: LoadoutSeniorPhysicianEars # maxItems: 1 @@ -29,11 +33,13 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutSeniorPhysicianHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutSeniorPhysicianHead + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalHeadBeretSeniorPhysician + #- type: characterItemGroup # id: LoadoutSeniorPhysicianId # maxItems: 1 @@ -59,7 +65,11 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutSeniorPhysicianUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutSeniorPhysicianUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalUniformJumpskirtSenior + - type: loadout + id: LoadoutMedicalUniformJumpsuitSenior diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml index 8ddf8b156fb..26db06aeb78 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml @@ -1,14 +1,34 @@ # All Medical -#- type: characterItemGroup -# id: LoadoutMedicalBackpacks -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutMedicalBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutBackpackMedical + - type: loadout + id: LoadoutBackpackVirology + - type: loadout + id: LoadoutBackpackGenetics + - type: loadout + id: LoadoutBackpackSatchelMedical + - type: loadout + id: LoadoutBackpackSatchelVirology + - type: loadout + id: LoadoutBackpackSatchelGenetics + - type: loadout + id: LoadoutBackpackDuffelMedical + - type: loadout + id: LoadoutBackpackDuffelVirology + - type: loadout + id: LoadoutBackpackDuffelGenetics + - type: loadout + id: LoadoutBackpackMedicalDuffelSurgeryFilled + +- type: characterItemGroup + id: LoadoutMedicalBelt + maxItems: 1 + items: + #- type: characterItemGroup # id: LoadoutMedicalEars # maxItems: 1 @@ -19,47 +39,95 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalEyes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutMedicalGloves -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutMedicalHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalEyes + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalEyesHudMedical + - type: loadout + id: LoadoutMedicalEyesEyepatchHudMedical + - type: loadout + id: LoadoutMedicalEyesHudMedicalPrescription + +- type: characterItemGroup + id: LoadoutMedicalGloves + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalGlovesNitrile + - type: loadout + id: LoadoutMedicalGlovesLatex + +- type: characterItemGroup + id: LoadoutMedicalHead + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalHeadSurgcapBlue + - type: loadout + id: LoadoutMedicalHeadSurgcapPurple + - type: loadout + id: LoadoutMedicalHeadSurgcapGreen + - type: loadout + id: LoadoutMedicalHeadSurgcapCyan + - type: loadout + id: LoadoutMedicalHeadSurgcapBlack + - type: loadout + id: LoadoutMedicalHeadSurgcapPink + - type: loadout + id: LoadoutMedicalHeadSurgcapWhite + - type: loadout + id: LoadoutMedicalHeadSurgcapCybersun + #- type: characterItemGroup # id: LoadoutMedicalId # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalNeck -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalNeckStethoscope + - type: loadout + id: LoadoutMedicalBedsheetMedical + #- type: characterItemGroup # id: LoadoutMedicalMask # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalOuter -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalOuterLabcoat + - type: loadout + id: LoadoutMedicalOuterCybersunWindbreaker + #- type: characterItemGroup # id: LoadoutMedicalShoes # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMedicalUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutMedicalUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalUniformScrubsBlue + - type: loadout + id: LoadoutMedicalUniformScrubsGreen + - type: loadout + id: LoadoutMedicalUniformScrubsPurple + - type: loadout + id: LoadoutMedicalUniformScrubsCyan + - type: loadout + id: LoadoutMedicalUniformScrubsBlack + - type: loadout + id: LoadoutMedicalUniformScrubsPink + - type: loadout + id: LoadoutMedicalUniformScrubsCybersun diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml index 46b294c559d..d2a1f1381d7 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml @@ -1,14 +1,22 @@ # Corpsman -#- type: characterItemGroup -# id: LoadoutCorpsmanBackpacks -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutCorpsmanBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutCorpsmanBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutCorpsmanBackpackBackpack + - type: loadout + id: LoadoutCorpsmanBackpackSatchel + - type: loadout + id: LoadoutCorpsmanBackpackDuffel + +- type: characterItemGroup + id: LoadoutCorpsmanBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingBeltCorpsmanWebbing + #- type: characterItemGroup # id: LoadoutCorpsmanEars # maxItems: 1 @@ -24,26 +32,34 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutCorpsmanGloves -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutCorpsmanHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutCorpsmanGloves + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingHandsGlovesNitrile + +- type: characterItemGroup + id: LoadoutCorpsmanHead + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingHeadHatBeretBrigmedic + - type: loadout + id: LoadoutClothingHeadHatBeretCorpsman + #- type: characterItemGroup # id: LoadoutCorpsmanId # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutCorpsmanNeck -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutCorpsmanNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutBedsheetBrigmedic + #- type: characterItemGroup # id: LoadoutCorpsmanMask # maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml index c81472ad337..068e00dd1ad 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/detective.yml @@ -49,11 +49,15 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutDetectiveOuter -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutDetectiveOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingOuterCoatDetective + - type: loadout + id: LoadoutOuterVestDetective + #- type: characterItemGroup # id: LoadoutDetectiveShoes # maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml index e400628d59f..9ccc5232e4a 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml @@ -21,7 +21,7 @@ - type: characterItemGroup maxItems: 1 - id: LoadoutHoSWeapon + id: LoadoutHeadOfSecurityWeapon items: - type: loadout id: LoadoutCommandHoSPulsePistol @@ -48,37 +48,73 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutHeadOfSecurityHead -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutHeadOfSecurityId -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutHeadOfSecurityNeck -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutHeadOfSecurityHead + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandHOSHatBeret + - type: loadout + id: LoadoutCommandHOSHatHoshat + +- type: characterItemGroup + id: LoadoutHeadOfSecurityId + maxItems: 1 + items: + - type: loadout + id: LoadoutHeadOfSecurityNTPDA + +- type: characterItemGroup + id: LoadoutHeadOfSecurityNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandHOSNeckMantle + - type: loadout + id: LoadoutCommandHOSNeckCloak + #- type: characterItemGroup # id: LoadoutHeadOfSecurityMask # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutHeadOfSecurityOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutHeadOfSecurityShoes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutHeadOfSecurityUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutHeadOfSecurityOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandHOSOuterWinter + - type: loadout + id: LoadoutCommandHOSOuterTrench + +- type: characterItemGroup + id: LoadoutHeadOfSecurityShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandHOSShoesBootsWinter + +- type: characterItemGroup + id: LoadoutHeadOfSecurityUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutUniformJumpskirtHoSBlue + - type: loadout + id: LoadoutUniformJumpskirtHoSGrey + - type: loadout + id: LoadoutCommandHOSJumpsuitAlt + - type: loadout + id: LoadoutCommandHOSJumpsuitBlue + - type: loadout + id: LoadoutCommandHOSJumpsuitGrey + - type: loadout + id: LoadoutCommandHOSJumpsuitParade + - type: loadout + id: LoadoutCommandHOSJumpsuitFormal + - type: loadout + id: LoadoutCommandHOSJumpskirtAlt + - type: loadout + id: LoadoutCommandHOSJumpskirtParade + - type: loadout + id: LoadoutCommandHOSJumpskirtFormal diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index e3edc5382b2..9cac5c34226 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -1,14 +1,26 @@ # All Security -#- type: characterItemGroup -# id: LoadoutSecurityBackpacks -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutSecurityBelt -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutSecurityBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingBackSecurity + - type: loadout + id: LoadoutClothingBackSecuritySatchel + - type: loadout + id: LoadoutClothingBackSecurityDuffel + +- type: characterItemGroup + id: LoadoutSecurityBelt + maxItems: 1 + items: + - type: loadout + id: LoadoutSecurityBeltWebbing + - type: loadout + id: LoadoutClothingBeltSecurity + - type: loadout + id: LoadoutClothingBeltHolster + #- type: characterItemGroup # id: LoadoutSecurityEars # maxItems: 1 @@ -104,21 +116,37 @@ - type: loadout id: LoadoutSecurityRevolverPythonNonlethal -#- type: characterItemGroup -# id: LoadoutSecurityEyes -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutSecurityEyes + maxItems: 1 + items: + - type: loadout + id: LoadoutSecurityEyesHudSecurity + - type: loadout + id: ClothingEyesGlassesSunglasses + - type: loadout + id: LoadoutSecurityEyesEyepatchHudSecurity + - type: loadout + id: LoadoutSecurityEyesHudSecurityPrescription + - type: loadout + id: LoadoutClothingEyesGlassesSecurity + #- type: characterItemGroup # id: LoadoutSecurityGloves # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutSecurityHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutSecurityHead + maxItems: 1 + items: + - type: loadout + id: LoadoutSecurityHeadHatBeret + - type: loadout + id: LoadoutClothingHeadHelmetBasic + - type: loadout + id: LoadoutSecurityHeadHelmetInsulated + #- type: characterItemGroup # id: LoadoutSecurityId # maxItems: 1 @@ -129,22 +157,48 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutSecurityMask -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutSecurityOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutSecurityShoes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutSecurityUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutSecurityMask + maxItems: 1 + items: + - type: loadout + id: LoadoutSecurityMaskGasSwat + +- type: characterItemGroup + id: LoadoutSecurityOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingOuterArmorPlateCarrier + - type: loadout + id: LoadoutClothingOuterArmorDuraVest + - type: loadout + id: LoadoutClothingOuterArmorBasic + - type: loadout + id: LoadoutClothingOuterArmorSlim + +- type: characterItemGroup + id: LoadoutSecurityShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutSecurityShoesJackboots + - type: loadout + id: LoadoutClothingShoesBootsCombat + +- type: characterItemGroup + id: LoadoutSecurityUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutSecurityUniformJumpsuitBlue + - type: loadout + id: LoadoutSecurityUniformJumpsuitGrey + - type: loadout + id: LoadoutSecurityUniformJumpskirtGrey + - type: loadout + id: LoadoutSecurityUniformJumpskirtBlue + - type: loadout + id: LoadoutUniformJumpsuitSecFormal + - type: loadout + id: LoadoutUniformJumpsuitSecSummer diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml index 63738189a8e..1b978323bfc 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/warden.yml @@ -29,11 +29,13 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutWardenHead -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutWardenHead + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingHeadHatBeretWarden + #- type: characterItemGroup # id: LoadoutWardenId # maxItems: 1 @@ -49,17 +51,27 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutWardenOuter -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutWardenOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutClothingOuterCoatWarden + #- type: characterItemGroup # id: LoadoutWardenShoes # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutWardenUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutWardenUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutUniformJumpsuitWardenBlue + - type: loadout + id: LoadoutUniformJumpsuitWardenGrey + - type: loadout + id: LoadoutUniformJumpskirtWardenBlue + - type: loadout + id: LoadoutUniformJumpskirtWardenGrey diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml index 46bf825f227..74fc945b3f7 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml @@ -86,6 +86,8 @@ - type: characterItemGroup id: LoadoutBartenderUniforms items: + - type: loadout + id: LoadoutServiceBartenderUniformPurple - type: loadout id: LoadoutServiceJumpsuitBartenderNt - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml index 2436bf0abc4..334ad0c4fde 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/botanist.yml @@ -58,7 +58,15 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutBotanistUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutBotanistUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceBotanistUniformOveralls + - type: loadout + id: LoadoutServiceJumpsuitHydroponicsNt + - type: loadout + id: LoadoutServiceJumpsuitHydroponicsIdris + - type: loadout + id: LoadoutServiceJumpsuitHydroponicsOrion diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml index 772fea26ec6..c25c313be70 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/clown.yml @@ -1,9 +1,15 @@ # Clown -#- type: characterItemGroup -# id: LoadoutClownBackpacks -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutClownBackpacks + maxItems: 1 + items: + - type: loadout + id: LoadoutBackpackClown + - type: loadout + id: LoadoutBackpackSatchelClown + - type: loadout + id: LoadoutBackpackDuffelClown + #- type: characterItemGroup # id: LoadoutClownBelt # maxItems: 1 @@ -39,27 +45,41 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutClownNeck -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutClownMask -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutClownOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutClownShoes -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutClownUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutClownNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceClownBedsheetClown + +- type: characterItemGroup + id: LoadoutClownMask + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceClownMaskSexy + +- type: characterItemGroup + id: LoadoutClownOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceClownOuterWinter + - type: loadout + id: LoadoutServiceClownOuterClownPriest + +- type: characterItemGroup + id: LoadoutClownShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceClownBootsWinter + +- type: characterItemGroup + id: LoadoutClownUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceClownOutfitJester + - type: loadout + id: LoadoutServiceClownOutfitJesterAlt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml index d849ba95824..cc5b0e16a33 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/janitor.yml @@ -59,7 +59,13 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutJanitorUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutJanitorUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceJumpsuitJanitorNt + - type: loadout + id: LoadoutServiceJumpsuitJanitorIdris + - type: loadout + id: LoadoutServiceJumpsuitJanitorOrion diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml index 5215929aca9..0a00475cfef 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/lawyer.yml @@ -59,7 +59,23 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutLawyerUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutLawyerUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceLawyerUniformBlueSuit + - type: loadout + id: LoadoutServiceLawyerUniformBlueSkirt + - type: loadout + id: LoadoutServiceLawyerUniformRedSuit + - type: loadout + id: LoadoutServiceLawyerUniformRedSkirt + - type: loadout + id: LoadoutServiceLawyerUniformPurpleSuit + - type: loadout + id: LoadoutServiceLawyerUniformPurpleSkirt + - type: loadout + id: LoadoutServiceLawyerUniformGoodSuit + - type: loadout + id: LoadoutServiceLawyerUniformGoodSkirt diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml index 2dbc03c152c..58e3d03e03f 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/mime.yml @@ -39,26 +39,38 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutMimeNeck -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutMimeMask -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutMimeOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutMimeShoes -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMimeNeck + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceMimeBedsheetMime + +- type: characterItemGroup + id: LoadoutMimeMask + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceMimeMaskSad + - type: loadout + id: LoadoutServiceMimeMaskScared + - type: loadout + id: LoadoutServiceMimeMaskSexy + +- type: characterItemGroup + id: LoadoutMimeOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceMimeOuterWinter + +- type: characterItemGroup + id: LoadoutMimeShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceMimeShoesBootsWinter + #- type: characterItemGroup # id: LoadoutMimeUniforms # maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml index df023122094..1436cf83a54 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/reporter.yml @@ -59,7 +59,13 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutReporterUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutReporterUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutServiceReporterUniformDetectivesuit + - type: loadout + id: LoadoutServiceReporterUniformDetectiveskirt + - type: loadout + id: LoadoutServiceReporterUniformJournalist diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml index 17b1eba629f..b530c421aee 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/uncategorized.yml @@ -64,29 +64,3 @@ # id: LoadoutServiceUniforms # maxItems: 1 # items: - - - - - -# Botanist -- type: characterItemGroup - id: LoadoutBotanistUniforms - items: - - type: loadout - id: LoadoutServiceJumpsuitHydroponicsNt - - type: loadout - id: LoadoutServiceJumpsuitHydroponicsIdris - - type: loadout - id: LoadoutServiceJumpsuitHydroponicsOrion - -# Janitor -- type: characterItemGroup - id: LoadoutJanitorUniforms - items: - - type: loadout - id: LoadoutServiceJumpsuitJanitorNt - - type: loadout - id: LoadoutServiceJumpsuitJanitorIdris - - type: loadout - id: LoadoutServiceJumpsuitJanitorOrion diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml index 99f2738a701..283448126b6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml @@ -113,7 +113,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering + group: LoadoutEngineeringHead - !type:CharacterDepartmentRequirement departments: - Engineering @@ -127,7 +127,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering + group: LoadoutEngineeringHead - !type:CharacterDepartmentRequirement departments: - Engineering @@ -141,7 +141,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering + group: LoadoutEngineeringHead - !type:CharacterDepartmentRequirement departments: - Engineering @@ -155,7 +155,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering + group: LoadoutEngineeringHead - !type:CharacterDepartmentRequirement departments: - Engineering @@ -169,7 +169,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering + group: LoadoutEngineeringHead - !type:CharacterDepartmentRequirement departments: - Engineering @@ -183,7 +183,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadEngineering + group: LoadoutEngineeringHead - !type:CharacterDepartmentRequirement departments: - Engineering @@ -204,7 +204,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterEngineering + group: LoadoutEngineeringOuter - !type:CharacterDepartmentRequirement departments: - Engineering diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml index b32b13bbb43..f0e78102258 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/cataloger.yml @@ -43,7 +43,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -57,7 +57,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -71,7 +71,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -85,7 +85,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -99,7 +99,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -113,7 +113,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -127,7 +127,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -141,7 +141,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian @@ -155,7 +155,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCataloguerUniforms + group: LoadoutCatalogerUniforms - !type:CharacterJobRequirement jobs: - Librarian diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml index 81c03a80ec4..f4c8869ccb3 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml @@ -46,7 +46,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutChaplainHead - !type:CharacterJobRequirement jobs: - Chaplain @@ -60,7 +60,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutChaplainHead - !type:CharacterJobRequirement jobs: - Chaplain @@ -74,7 +74,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutChaplainHead - !type:CharacterJobRequirement jobs: - Chaplain @@ -88,7 +88,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutChaplainHead - !type:CharacterJobRequirement jobs: - Chaplain @@ -105,7 +105,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience + group: LoadoutChaplainNeck - !type:CharacterJobRequirement jobs: - Chaplain @@ -120,7 +120,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskScience + group: LoadoutChaplainMask - !type:CharacterJobRequirement jobs: - Chaplain @@ -135,7 +135,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutChaplainOuter - !type:CharacterJobRequirement jobs: - Chaplain @@ -149,7 +149,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutChaplainOuter - !type:CharacterJobRequirement jobs: - Chaplain @@ -163,7 +163,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutChaplainOuter - !type:CharacterJobRequirement jobs: - Chaplain @@ -177,7 +177,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutChaplainOuter - !type:CharacterJobRequirement jobs: - Chaplain diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml index de389aeba3c..5b7a3c81bee 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystagogue.yml @@ -92,7 +92,7 @@ tracker: JobResearchDirector min: 36000 # 10 hours - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerId + group: LoadoutMystagogueId - !type:CharacterJobRequirement jobs: - ResearchDirector @@ -142,6 +142,20 @@ items: - ClothingNeckCloakMystagogue +- type: loadout + id: LoadoutMystagogueNeckSciencemedal + category: JobsEpistemicsMystagogue + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMystagogueNeck + - !type:CharacterJobRequirement + jobs: + - ResearchDirector + items: + - ClothingNeckSciencemedal + # Mask # Outer diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml index f2e3f796545..de64c466d38 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -15,7 +15,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesScience + group: LoadoutEpistemicsEyes - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -29,7 +29,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesScience + group: LoadoutEpistemicsEyes - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -44,7 +44,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience + group: LoadoutEpistemicsGloves - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -58,7 +58,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience + group: LoadoutEpistemicsGloves - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -72,7 +72,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesScience + group: LoadoutEpistemicsGloves - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -87,7 +87,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutEpistemicsHead - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -101,7 +101,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutEpistemicsHead - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -117,7 +117,7 @@ - ClothingHeadTechPriest requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadScience + group: LoadoutEpistemicsHead - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -132,7 +132,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience + group: LoadoutEpistemicsNeck - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -146,7 +146,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience + group: LoadoutEpistemicsNeck - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -160,7 +160,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckScience + group: LoadoutEpistemicsNeck - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -177,7 +177,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEpistemicsOuter - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -191,7 +191,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEpistemicsOuter - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -199,13 +199,13 @@ - ClothingOuterCoatLab - type: loadout - id: LoadoutSciencegOuterCoatRobo + id: LoadoutScienceOuterCoatRobo category: JobsEpistemicsAAUncategorized cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEpistemicsOuter - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -219,7 +219,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEpistemicsOuter - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -233,7 +233,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEpistemicsOuter - !type:CharacterDepartmentRequirement departments: - Epistemics @@ -248,7 +248,7 @@ - ClothingOuterRobeTechPriest requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutEpistemicsOuter - !type:CharacterDepartmentRequirement departments: - Epistemics diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml index 9a05b17451c..190c7467b54 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml @@ -12,6 +12,18 @@ # Gloves # Head +- type: loadout + id: LoadoutCommandQMHeadSoft + category: JobsLogisticsLogisticsOfficer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerHead + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - ClothingHeadHatQMsoft # Id - type: loadout @@ -24,7 +36,7 @@ tracker: JobQuartermaster min: 36000 # 10 hours - !type:CharacterItemGroupRequirement - group: LoadoutQuartermasterId + group: LoadoutLogisticsOfficerId - !type:CharacterJobRequirement jobs: - Quartermaster @@ -32,70 +44,64 @@ - QuartermasterNTPDA # Neck - -# Mask - -# Outer - -# Shoes - -# Uniforms - - type: loadout id: LoadoutCommandQMNeckCloak category: JobsLogisticsLogisticsOfficer cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerNeck - !type:CharacterJobRequirement jobs: - Quartermaster items: - ClothingNeckCloakQm -- type: loadout - id: LoadoutCommandQMUniformTurtleneck - category: JobsLogisticsLogisticsOfficer - cost: 0 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - Quartermaster - items: - - ClothingUniformJumpsuitQMTurtleneck +# Mask +# Outer + +# Shoes - type: loadout - id: LoadoutCommandQMUniformTurtleneckSkirt + id: LoadoutCommandQMShoesBootsWinter category: JobsLogisticsLogisticsOfficer cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerShoes - !type:CharacterJobRequirement jobs: - Quartermaster items: - - ClothingUniformJumpskirtQMTurtleneck + - ClothingShoesBootsWinterLogisticsOfficer +# Uniforms - type: loadout - id: LoadoutCommandQMHeadSoft + id: LoadoutCommandQMUniformTurtleneck category: JobsLogisticsLogisticsOfficer cost: 0 + exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerUniforms - !type:CharacterJobRequirement jobs: - Quartermaster items: - - ClothingHeadHatQMsoft + - ClothingUniformJumpsuitQMTurtleneck - type: loadout - id: LoadoutCommandQMShoesBootsWinter + id: LoadoutCommandQMUniformTurtleneckSkirt category: JobsLogisticsLogisticsOfficer cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerUniforms - !type:CharacterJobRequirement jobs: - Quartermaster items: - - ClothingShoesBootsWinterLogisticsOfficer + - ClothingUniformJumpskirtQMTurtleneck diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index 9d26b537cc2..8b8aac38378 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -1,5 +1,46 @@ # Chemist # Backpacks +- type: loadout + id: LoadoutChemistryBackpackBackpack + category: JobsMedicalChemist + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelChemistry + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistBackpacks + - !type:CharacterJobRequirement + jobs: + - Chemist + +- type: loadout + id: LoadoutBackpackSatchelChemistry + category: JobsMedicalChemist + cost: 0 + exclusive: true + items: + - ClothingBackpackSatchelChemistry + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistBackpacks + - !type:CharacterJobRequirement + jobs: + - Chemist + +- type: loadout + id: LoadoutBackpackDuffelChemistry + category: JobsMedicalChemist + cost: 0 + exclusive: true + items: + - ClothingBackpackDuffelChemistry + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChemistBackpacks + - !type:CharacterJobRequirement + jobs: + - Chemist # Belt - type: loadout @@ -136,7 +177,7 @@ # Eyes - type: loadout - id: LoadoutMedicalEyesGlassesChemical + id: LoadoutMedicalEyesGlassesChemicalBudget category: JobsMedicalChemist cost: 0 exclusive: true diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml index bfce53a2b13..b54fe87ce04 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml @@ -17,7 +17,7 @@ - ClothingBeltMedical - type: loadout - id: LoadoutMedicalBeltMedicalFilled + id: LoadoutMedicalDoctorBeltMedicalFilled category: JobsMedicalMedicalDoctor cost: 0 exclusive: true @@ -31,7 +31,7 @@ - ClothingBeltMedicalFilled - type: loadout - id: LoadoutMedicalBeltMedicalAdvancedFilled + id: LoadoutMedicalDoctorBeltMedicalAdvancedFilled category: JobsMedicalMedicalDoctor cost: 2 exclusive: true diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml index c5eed74e9e8..d95fe24466a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml @@ -18,7 +18,7 @@ - type: loadout id: LoadoutMedicalInternBeltMedicalFilled - category: JobsMedicalAUncategorized + category: JobsMedicalMedicalIntern cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml index 6ca0188c248..613d487eff0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml @@ -20,24 +20,10 @@ items: - ClothingBeltMedical -- type: loadout - id: LoadoutSeniorPhysicianBeltMedicalFilled - category: JobsMedicalSeniorPhysician - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMedicalDoctorBelt - - !type:CharacterJobRequirement - Jobs: - - SeniorPhysician - items: - - ClothingBeltMedicalFilled - - type: loadout id: LoadoutSeniorPhysicianBeltMedicalAdvancedFilled category: JobsMedicalSeniorPhysician - cost: 1 + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement @@ -55,7 +41,7 @@ # Head - type: loadout id: LoadoutMedicalHeadBeretSeniorPhysician - category: JobsMedicalAUncategorized + category: JobsMedicalSeniorPhysician cost: 0 exclusive: true requirements: diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml index 3e495850bcd..b5a3681440b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml @@ -56,20 +56,6 @@ departments: - Medical -- type: loadout - id: LoadoutBackpackSatchelChemistry - category: JobsMedicalAUncategorized - cost: 0 - exclusive: true - items: - - ClothingBackpackSatchelChemistry - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMedicalBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackSatchelVirology category: JobsMedicalAUncategorized @@ -112,20 +98,6 @@ departments: - Medical -- type: loadout - id: LoadoutBackpackDuffelChemistry - category: JobsMedicalAUncategorized - cost: 0 - exclusive: true - items: - - ClothingBackpackDuffelChemistry - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMedicalBackpacks - - !type:CharacterDepartmentRequirement - departments: - - Medical - - type: loadout id: LoadoutBackpackDuffelVirology category: JobsMedicalAUncategorized diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml index b4adbcaee62..5f7781e74ce 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml @@ -9,35 +9,35 @@ - ClothingBackpackBrigmedicFilled requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutCorpsmanBackpacks - !type:CharacterJobRequirement jobs: - Brigmedic - type: loadout id: LoadoutCorpsmanBackpackSatchel - category: Backpacks + category: JobsSecurityCorpsman cost: 0 exclusive: true items: - ClothingBackpackSatchelBrigmedicFilled requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutCorpsmanBackpacks - !type:CharacterJobRequirement jobs: - Brigmedic - type: loadout id: LoadoutCorpsmanBackpackDuffel - category: Backpacks + category: JobsSecurityCorpsman cost: 0 exclusive: true items: - ClothingBackpackDuffelBrigmedicFilled requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackpacks + group: LoadoutCorpsmanBackpacks - !type:CharacterJobRequirement jobs: - Brigmedic @@ -50,7 +50,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity + group: LoadoutCorpsmanBelt - !type:CharacterJobRequirement jobs: - Brigmedic @@ -71,7 +71,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutGlovesSecurity + group: LoadoutCorpsmanGloves - !type:CharacterJobRequirement jobs: - Brigmedic @@ -86,7 +86,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutCorpsmanHead - !type:CharacterJobRequirement jobs: - Brigmedic @@ -100,7 +100,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutCorpsmanHead - !type:CharacterJobRequirement jobs: - Brigmedic @@ -117,7 +117,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckSecurity + group: LoadoutCorpsmanNeck - !type:CharacterJobRequirement jobs: - Brigmedic diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml index 415e56af0ea..f43a23e822f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml @@ -15,7 +15,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon + group: LoadoutHeadOfSecurityWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -28,7 +28,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon + group: LoadoutHeadOfSecurityWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -41,7 +41,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon + group: LoadoutHeadOfSecurityWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -54,7 +54,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon + group: LoadoutHeadOfSecurityWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -67,7 +67,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon + group: LoadoutHeadOfSecurityWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -80,7 +80,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon + group: LoadoutHeadOfSecurityWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -93,7 +93,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon + group: LoadoutHeadOfSecurityWeapon - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -110,6 +110,8 @@ category: JobsSecurityHeadOfSecurity cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityHead - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -121,6 +123,8 @@ category: JobsSecurityHeadOfSecurity cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityHead - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -152,6 +156,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityNeck - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -164,6 +170,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityNeck - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -178,6 +186,8 @@ category: JobsSecurityHeadOfSecurity cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityOuter - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -189,6 +199,8 @@ category: JobsSecurityHeadOfSecurity cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityOuter - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -202,6 +214,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityShoes - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -216,7 +230,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -230,7 +244,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -243,6 +257,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -255,6 +271,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -267,6 +285,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -279,6 +299,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -291,6 +313,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -303,6 +327,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -315,6 +341,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity @@ -327,6 +355,8 @@ cost: 0 exclusive: true requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHeadOfSecurityUniforms - !type:CharacterJobRequirement jobs: - HeadOfSecurity diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index 38f92a97f6c..7b96b9b40d5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -7,7 +7,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity + group: LoadoutSecurityBackpacks - !type:CharacterDepartmentRequirement departments: - Security @@ -21,7 +21,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity + group: LoadoutSecurityBackpacks - !type:CharacterDepartmentRequirement departments: - Security @@ -35,7 +35,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity + group: LoadoutSecurityBackpacks - !type:CharacterDepartmentRequirement departments: - Security @@ -50,7 +50,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity + group: LoadoutSecurityBelt - !type:CharacterDepartmentRequirement departments: - Security @@ -64,7 +64,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity + group: LoadoutSecurityBelt - !type:CharacterDepartmentRequirement departments: - Security @@ -78,7 +78,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBeltSecurity + group: LoadoutSecurityBelt - !type:CharacterDepartmentRequirement departments: - Security @@ -97,7 +97,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -109,6 +109,8 @@ category: JobsSecurityAUncategorized cost: 0 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -124,7 +126,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -140,7 +142,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -153,7 +155,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -166,7 +168,7 @@ cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -176,14 +178,14 @@ - type: loadout id: LoadoutSpeedLoaderMagnum category: JobsSecurityAUncategorized - cost: 0 + cost: 2 exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -193,14 +195,14 @@ - type: loadout id: LoadoutSpeedLoaderMagnumSpare category: JobsSecurityAUncategorized - cost: 2 + cost: 4 exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -210,11 +212,11 @@ - type: loadout id: LoadoutSpeedLoaderMagnumRubber category: JobsSecurityAUncategorized - cost: 0 + cost: 2 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -224,11 +226,11 @@ - type: loadout id: LoadoutSpeedLoaderMagnumRubberSpare category: JobsSecurityAUncategorized - cost: 2 + cost: 4 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -238,14 +240,14 @@ - type: loadout id: LoadoutMagazineMagnum category: JobsSecurityAUncategorized - cost: 2 + cost: 4 exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -255,14 +257,14 @@ - type: loadout id: LoadoutMagazineMagnumRubber category: JobsSecurityAUncategorized - cost: 2 + cost: 4 exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -272,14 +274,14 @@ - type: loadout id: LoadoutMagazineMagnumSpare category: JobsSecurityAUncategorized - cost: 2 + cost: 4 exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -289,14 +291,14 @@ - type: loadout id: LoadoutMagazineMagnumRubberSpare category: JobsSecurityAUncategorized - cost: 2 + cost: 4 exclusive: true requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutEquipmentSecurity + group: LoadoutSecurityEquipment - !type:CharacterDepartmentRequirement departments: - Security @@ -313,7 +315,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -329,7 +331,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -342,7 +344,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -358,7 +360,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -371,7 +373,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -387,7 +389,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -400,7 +402,7 @@ cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -410,13 +412,13 @@ - type: loadout id: LoadoutSecurityPistolN1984 category: JobsSecurityAUncategorized - cost: 2 + cost: 5 requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -426,10 +428,10 @@ - type: loadout id: LoadoutSecurityPistolN1984NonLethal category: JobsSecurityAUncategorized - cost: 2 + cost: 5 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -445,7 +447,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -458,7 +460,7 @@ cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -474,7 +476,7 @@ department: Security min: 108000 # 30 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -490,7 +492,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -509,7 +511,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -525,7 +527,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -541,7 +543,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -557,7 +559,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -570,7 +572,7 @@ cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -580,13 +582,13 @@ - type: loadout id: LoadoutSecurityRevolverSnub category: JobsSecurityAUncategorized - cost: 2 + cost: 3 requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -596,10 +598,10 @@ - type: loadout id: LoadoutSecurityRevolverSnubNonlethal category: JobsSecurityAUncategorized - cost: 2 + cost: 3 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -615,7 +617,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -628,7 +630,7 @@ cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -638,13 +640,13 @@ - type: loadout id: LoadoutSecurityRevolverFitz category: JobsSecurityAUncategorized - cost: 1 + cost: 2 requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -654,10 +656,10 @@ - type: loadout id: LoadoutSecurityRevolverFitzNonlethal category: JobsSecurityAUncategorized - cost: 1 + cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -667,13 +669,13 @@ - type: loadout id: LoadoutSecurityRevolverPython category: JobsSecurityAUncategorized - cost: 3 + cost: 5 requirements: - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -683,10 +685,10 @@ - type: loadout id: LoadoutSecurityRevolverPythonNonlethal category: JobsSecurityAUncategorized - cost: 3 + cost: 5 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutWeaponSecurity + group: LoadoutSecurityWeapon - !type:CharacterDepartmentRequirement departments: - Security @@ -701,7 +703,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutSecurityEyes - !type:CharacterDepartmentRequirement departments: - Security @@ -715,7 +717,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutSecurityEyes - !type:CharacterDepartmentRequirement departments: - Security @@ -729,7 +731,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutSecurityEyes - !type:CharacterDepartmentRequirement departments: - Security @@ -743,7 +745,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutSecurityEyes - !type:CharacterDepartmentRequirement departments: - Security @@ -760,7 +762,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutEyesSecurity + group: LoadoutSecurityEyes - !type:CharacterDepartmentRequirement departments: - Security @@ -777,7 +779,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutSecurityHead - !type:CharacterDepartmentRequirement departments: - Security @@ -791,7 +793,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutSecurityHead - !type:CharacterDepartmentRequirement departments: - Security @@ -804,7 +806,7 @@ cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutSecurityHead - !type:CharacterDepartmentRequirement departments: - Security @@ -823,7 +825,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskSecurity + group: LoadoutSecurityMask - !type:CharacterJobRequirement jobs: - Warden @@ -839,7 +841,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutSecurityOuter - !type:CharacterDepartmentRequirement departments: - Security @@ -853,7 +855,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutSecurityOuter - !type:CharacterDepartmentRequirement departments: - Security @@ -867,7 +869,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutSecurityOuter - !type:CharacterDepartmentRequirement departments: - Security @@ -881,7 +883,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutSecurityOuter - !type:CharacterDepartmentRequirement departments: - Security @@ -896,7 +898,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesSecurity + group: LoadoutSecurityShoes - !type:CharacterDepartmentRequirement departments: - Security @@ -910,7 +912,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesSecurity + group: LoadoutSecurityShoes - !type:CharacterDepartmentRequirement departments: - Security @@ -925,7 +927,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutSecurityUniforms - !type:CharacterDepartmentRequirement departments: - Security @@ -939,7 +941,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutSecurityUniforms - !type:CharacterDepartmentRequirement departments: - Security @@ -953,7 +955,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutSecurityUniforms - !type:CharacterDepartmentRequirement departments: - Security @@ -967,7 +969,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutSecurityUniforms - !type:CharacterDepartmentRequirement departments: - Security @@ -981,7 +983,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutSecurityUniforms - !type:CharacterDepartmentRequirement departments: - Security @@ -995,7 +997,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity + group: LoadoutSecurityUniforms - !type:CharacterDepartmentRequirement departments: - Security diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 2edf23e13fa..45ef25e326a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -19,7 +19,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadSecurity + group: LoadoutWardenHead - !type:CharacterJobRequirement jobs: - Warden @@ -40,7 +40,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterSecurity + group: LoadoutWardenOuter - !type:CharacterJobRequirement jobs: - Warden diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml index cde23eeaf38..e3540a2234a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml @@ -123,7 +123,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear + group: LoadoutBartenderOuter - !type:CharacterJobRequirement jobs: - Bartender @@ -137,7 +137,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear + group: LoadoutBartenderOuter - !type:CharacterJobRequirement jobs: - Bartender @@ -151,7 +151,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear + group: LoadoutBartenderOuter - !type:CharacterJobRequirement jobs: - Bartender @@ -165,7 +165,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutBartenderOuterwear + group: LoadoutBartenderOuter - !type:CharacterJobRequirement jobs: - Bartender @@ -182,7 +182,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutBartenderUniforms - !type:CharacterJobRequirement jobs: - Bartender diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml index 0559eac1e46..c34eb3f55ab 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml @@ -31,7 +31,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutBotanistUniforms - !type:CharacterJobRequirement jobs: - Botanist diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml index 1d8c0753b02..abdbbea5b40 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/chef.yml @@ -12,142 +12,138 @@ # Gloves # Head - -# Id - -# Neck - -# Mask - -# Outer - -# Shoes - -# Uniforms - type: loadout - id: LoadoutServiceJumpsuitChefNt + id: LoadoutServiceHeadChefNt category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefUniforms + group: LoadoutChefHead - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingUniformJumpsuitChefNt + - ClothingHeadHatChefNt - type: loadout - id: LoadoutServiceJumpsuitChefIdris + id: LoadoutServiceHeadChefIdris category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefUniforms + group: LoadoutChefHead - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingUniformJumpsuitChefIdris + - ClothingHeadHatChefIdris - type: loadout - id: LoadoutServiceJumpsuitChefOrion + id: LoadoutServiceHeadChefOrion category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefUniforms + group: LoadoutChefHead - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingUniformJumpsuitChefOrion + - ClothingHeadHatChefOrion -# Head +# Id + +# Neck + +# Mask + +# Outer - type: loadout - id: LoadoutServiceHeadChefNt + id: LoadoutServiceOuterChefNt category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefHead + group: LoadoutChefOuter - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingHeadHatChefNt + - ClothingOuterJacketChefNt - type: loadout - id: LoadoutServiceHeadChefIdris + id: LoadoutServiceOuterChefIdris category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefHead + group: LoadoutChefOuter - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingHeadHatChefIdris + - ClothingOuterJacketChefIdris - type: loadout - id: LoadoutServiceHeadChefOrion + id: LoadoutServiceOuterChefOrion category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefHead + group: LoadoutChefOuter - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingHeadHatChefOrion + - ClothingOuterJacketChefOrion -# Outer +# Shoes + +# Uniforms - type: loadout - id: LoadoutServiceOuterChefNt + id: LoadoutServiceJumpsuitChefNt category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefOuter + group: LoadoutChefUniforms - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingOuterJacketChefNt + - ClothingUniformJumpsuitChefNt - type: loadout - id: LoadoutServiceOuterChefIdris + id: LoadoutServiceJumpsuitChefIdris category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefOuter + group: LoadoutChefUniforms - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingOuterJacketChefIdris + - ClothingUniformJumpsuitChefIdris - type: loadout - id: LoadoutServiceOuterChefOrion + id: LoadoutServiceJumpsuitChefOrion category: JobsServiceChef cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChefOuter + group: LoadoutChefUniforms - !type:CharacterJobRequirement jobs: - Chef items: - - ClothingOuterJacketChefOrion + - ClothingUniformJumpsuitChefOrion diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml index aaf31235416..a522ab8c9db 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/clown.yml @@ -57,46 +57,36 @@ # Id # Neck - -# Mask - -# Outer - -# Shoes - -# Uniforms - type: loadout - id: LoadoutServiceClownOutfitJester + id: LoadoutServiceClownBedsheetClown category: JobsServiceClown cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutClownNeck - !type:CharacterJobRequirement jobs: - Clown items: - - ClothingUniformJumpsuitJester - - ClothingHeadHatJester - - ClothingShoesJester + - BedsheetClown +# Mask - type: loadout - id: LoadoutServiceClownOutfitJesterAlt + id: LoadoutServiceClownMaskSexy category: JobsServiceClown cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutClownMask - !type:CharacterJobRequirement jobs: - Clown items: - - ClothingUniformJumpsuitJesterAlt - - ClothingHeadHatJesterAlt - - ClothingShoesJester + - ClothingMaskSexyClown +# Outer - type: loadout id: LoadoutServiceClownOuterWinter category: JobsServiceClown @@ -104,7 +94,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterService + group: LoadoutClownOuter - !type:CharacterJobRequirement jobs: - Clown @@ -118,13 +108,14 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterService + group: LoadoutClownOuter - !type:CharacterJobRequirement jobs: - Clown items: - ClothingOuterClownPriest +# Shoes - type: loadout id: LoadoutServiceClownBootsWinter category: JobsServiceClown @@ -132,37 +123,42 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesService + group: LoadoutClownShoes - !type:CharacterJobRequirement jobs: - Clown items: - ClothingShoesBootsWinterClown +# Uniforms - type: loadout - id: LoadoutServiceClownMaskSexy + id: LoadoutServiceClownOutfitJester category: JobsServiceClown cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskService + group: LoadoutClownUniforms - !type:CharacterJobRequirement jobs: - Clown items: - - ClothingMaskSexyClown + - ClothingUniformJumpsuitJester + - ClothingHeadHatJester + - ClothingShoesJester - type: loadout - id: LoadoutServiceClownBedsheetClown + id: LoadoutServiceClownOutfitJesterAlt category: JobsServiceClown cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckService + group: LoadoutClownUniforms - !type:CharacterJobRequirement jobs: - Clown items: - - BedsheetClown + - ClothingUniformJumpsuitJesterAlt + - ClothingHeadHatJesterAlt + - ClothingShoesJester diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml index 45954274876..d2dd0393cdc 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/lawyer.yml @@ -26,12 +26,12 @@ # Uniforms - type: loadout id: LoadoutServiceLawyerUniformBlueSuit - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer @@ -40,12 +40,12 @@ - type: loadout id: LoadoutServiceLawyerUniformBlueSkirt - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer @@ -54,12 +54,12 @@ - type: loadout id: LoadoutServiceLawyerUniformRedSuit - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer @@ -68,12 +68,12 @@ - type: loadout id: LoadoutServiceLawyerUniformRedSkirt - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer @@ -82,12 +82,12 @@ - type: loadout id: LoadoutServiceLawyerUniformPurpleSuit - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer @@ -96,12 +96,12 @@ - type: loadout id: LoadoutServiceLawyerUniformPurpleSkirt - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer @@ -110,12 +110,12 @@ - type: loadout id: LoadoutServiceLawyerUniformGoodSuit - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer @@ -124,12 +124,12 @@ - type: loadout id: LoadoutServiceLawyerUniformGoodSkirt - category: JobsServiceAUncategorized + category: JobsServiceLawyer cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutLawyerUniforms - !type:CharacterJobRequirement jobs: - Lawyer diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml index 18583e67e95..d83ce2bae18 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/mime.yml @@ -16,36 +16,30 @@ # Id # Neck - -# Mask - -# Outer - -# Shoes - -# Uniforms - type: loadout - id: LoadoutServiceMimeOuterWinter - category: JobsServiceAUncategorized - cost: 1 + id: LoadoutServiceMimeBedsheetMime + category: JobsServiceMime + cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterService + group: LoadoutMimeNeck - !type:CharacterJobRequirement jobs: - Mime items: - - ClothingOuterWinterMime + - BedsheetMime + +# Mask - type: loadout id: LoadoutServiceMimeMaskSad - category: JobsServiceAUncategorized + category: JobsServiceMime cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskService + group: LoadoutMimeMask - !type:CharacterJobRequirement jobs: - Mime @@ -54,12 +48,12 @@ - type: loadout id: LoadoutServiceMimeMaskScared - category: JobsServiceAUncategorized + category: JobsServiceMime cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskService + group: LoadoutMimeMask - !type:CharacterJobRequirement jobs: - Mime @@ -68,42 +62,45 @@ - type: loadout id: LoadoutServiceMimeMaskSexy - category: JobsServiceAUncategorized + category: JobsServiceMime cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutMaskService + group: LoadoutMimeMask - !type:CharacterJobRequirement jobs: - Mime items: - ClothingMaskSexyMime +# Outer - type: loadout - id: LoadoutServiceMimeShoesBootsWinter - category: JobsServiceAUncategorized - cost: 0 + id: LoadoutServiceMimeOuterWinter + category: JobsServiceMime + cost: 1 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesService + group: LoadoutMimeOuter - !type:CharacterJobRequirement jobs: - Mime items: - - ClothingShoesBootsWinterMime + - ClothingOuterWinterMime +# Shoes - type: loadout - id: LoadoutServiceMimeBedsheetMime - category: JobsServiceAUncategorized + id: LoadoutServiceMimeShoesBootsWinter + category: JobsServiceMime cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeckService + group: LoadoutMimeShoes - !type:CharacterJobRequirement jobs: - Mime items: - - BedsheetMime + - ClothingShoesBootsWinterMime +# Uniforms diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml index 9808833530c..d03b95b3a0c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/reporter.yml @@ -26,12 +26,12 @@ # Uniforms - type: loadout id: LoadoutServiceReporterUniformDetectivesuit - category: JobsServiceAUncategorized + category: JobsServiceReporter cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutReporterUniforms - !type:CharacterJobRequirement jobs: - Reporter @@ -40,12 +40,12 @@ - type: loadout id: LoadoutServiceReporterUniformDetectiveskirt - category: JobsServiceAUncategorized + category: JobsServiceReporter cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutReporterUniforms - !type:CharacterJobRequirement jobs: - Reporter @@ -54,12 +54,12 @@ - type: loadout id: LoadoutServiceReporterUniformJournalist - category: JobsServiceAUncategorized + category: JobsServiceReporter cost: 0 exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsService + group: LoadoutReporterUniforms - !type:CharacterJobRequirement jobs: - Reporter From f26ed01fd80fb49b54880f45f6d40d52db09802e Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 16:05:02 -0500 Subject: [PATCH 21/27] Stuff missing --- .../Objects/Specific/Medical/healing.yml | 27 +++++++++++++++++++ .../Loadouts/Jobs/Medical/medicalIntern.yml | 4 +-- .../Objects/Specific/Medical/pills.yml | 13 +++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 03703aad1e1..4c43596f870 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -597,6 +597,33 @@ - id: PillSpaceDrugs amount: 5 +- type: entity + name: pax + parent: Pill + id: PillPax + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Pax + Quantity: 10 + +- type: entity + name: pill canister (Pax 10u) + parent: PillCanister + id: PillCanisterPax + suffix: Pax, 5 + components: + - type: Label + currentLabel: Pax 10u + - type: StorageFill + contents: + - id: PillPax + amount: 5 + + - type: entity name: pill (tricordrazine 10u) parent: Pill diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml index d95fe24466a..9c0f5fc9ecc 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalIntern.yml @@ -11,7 +11,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutMedicalInternBelt - !type:CharacterJobRequirement - Jobs: + jobs: - MedicalIntern items: - ClothingBeltMedical @@ -25,7 +25,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutMedicalInternBelt - !type:CharacterJobRequirement - Jobs: + jobs: - MedicalIntern items: - ClothingBeltMedicalFilled diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml index 962f5351948..20185b2289e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml @@ -25,3 +25,16 @@ reagents: - ReagentId: Cryptobiolin Quantity: 20 + +- type: entity + name: pill canister (Cryptobiolin 20u) + parent: PillCanister + id: PillCanisterCryptobiolin + suffix: Cryptobiolin, 5 + components: + - type: Label + currentLabel: Cryptobiolin 20u + - type: StorageFill + contents: + - id: PillCryptobiolin + amount: 5 From f6affdd083094ce6cfbf1a628e7ee4c0cd866a14 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 16:09:41 -0500 Subject: [PATCH 22/27] More fixes. --- .../Loadouts/Jobs/Medical/chiefMedicalOfficer.yml | 4 ++-- .../Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml | 6 +++--- .../Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml index 569aea8422b..b5e82749cec 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml @@ -11,7 +11,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutChiefMedicalOfficerBelt - !type:CharacterJobRequirement - Jobs: + jobs: - ChiefMedicalOfficer items: - ClothingBeltMedical @@ -25,7 +25,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutChiefMedicalOfficerBelt - !type:CharacterJobRequirement - Jobs: + jobs: - ChiefMedicalOfficer items: - ClothingBeltMedicalAdvancedFilled diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml index b54fe87ce04..9aba4313287 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medicalDoctor.yml @@ -11,7 +11,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutMedicalDoctorBelt - !type:CharacterJobRequirement - Jobs: + jobs: - MedicalDoctor items: - ClothingBeltMedical @@ -25,7 +25,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutMedicalDoctorBelt - !type:CharacterJobRequirement - Jobs: + jobs: - MedicalDoctor items: - ClothingBeltMedicalFilled @@ -39,7 +39,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutMedicalDoctorBelt - !type:CharacterJobRequirement - Jobs: + jobs: - MedicalDoctor items: - ClothingBeltMedicalAdvancedFilled diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml index 613d487eff0..a8937cc2f0e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml @@ -15,7 +15,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutSeniorPhysicianBelt - !type:CharacterJobRequirement - Jobs: + jobs: - MedicalDoctor items: - ClothingBeltMedical @@ -29,7 +29,7 @@ - !type:CharacterItemGroupRequirement group: LoadoutSeniorPhysicianBelt - !type:CharacterJobRequirement - Jobs: + jobs: - SeniorPhysician items: - ClothingBeltMedicalAdvancedFilled From 95312b8c23a046792334041be0baad4e031f6621 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 16:14:13 -0500 Subject: [PATCH 23/27] Why is it not nullable?... --- .../CharacterItemGroups/Jobs/Medical/uncategorized.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml index 26db06aeb78..02d9dbda3bc 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml @@ -24,10 +24,10 @@ - type: loadout id: LoadoutBackpackMedicalDuffelSurgeryFilled -- type: characterItemGroup - id: LoadoutMedicalBelt - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutMedicalBelt +# maxItems: 1 +# items: #- type: characterItemGroup # id: LoadoutMedicalEars From 0cba9868fb815cdddb7f0dfeaa7bf570e6293cd5 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 16:27:34 -0500 Subject: [PATCH 24/27] Update captain.yml --- .../CharacterItemGroups/Jobs/Command/captain.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml index 6f937be1916..57df945ec91 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml @@ -22,15 +22,15 @@ - type: loadout id: LoadoutCaptainSwordSheath -- type: characterItemGroup - id: LoadoutCaptainEars - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCaptainEars +# maxItems: 1 +# items: -- type: characterItemGroup - id: LoadoutCaptainEquipment - maxItems: 1 - items: +#- type: characterItemGroup +# id: LoadoutCaptainEquipment +# maxItems: 1 +# items: - type: characterItemGroup id: LoadoutCaptainTrinkets From 21fdfa574facbc78d9fb5bb5d3e0b7af9f0d9be0 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 16:37:46 -0500 Subject: [PATCH 25/27] More yml fixes --- .../Jobs/Epistemics/psionicMantis.yml | 12 +++-- .../Loadouts/Jobs/Command/captain.yml | 8 +-- .../Loadouts/Jobs/Command/headOfPersonnel.yml | 2 +- .../Engineering/atmosphericTechnician.yml | 4 +- .../Jobs/Engineering/chiefEngineer.yml | 4 +- .../Loadouts/Jobs/Epistemics/chaplain.yml | 4 +- .../Jobs/Epistemics/psionicMantis.yml | 2 +- .../Jobs/Epistemics/uncategorized.yml | 2 +- .../Loadouts/Jobs/Medical/uncategorized.yml | 18 +++---- .../Loadouts/Jobs/Security/uncategorized.yml | 52 +++++++++---------- .../Objects/Specific/Medical/pills.yml | 27 ++++++++++ 11 files changed, 82 insertions(+), 53 deletions(-) diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml index f8941e804e1..dc9f47ba08a 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/psionicMantis.yml @@ -49,11 +49,13 @@ # maxItems: 1 # items: # -#- type: characterItemGroup -# id: LoadoutPsionicMantisOuter -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutPsionicMantisOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceOuterWinterCoatMantis + #- type: characterItemGroup # id: LoadoutPsionicMantisShoes # maxItems: 1 diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index ae564e127eb..d4676e124d5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -442,7 +442,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCaptainUniform + group: LoadoutCaptainUniforms - !type:CharacterJobRequirement jobs: - Captain @@ -456,7 +456,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCaptainUniform + group: LoadoutCaptainUniforms - !type:CharacterJobRequirement jobs: - Captain @@ -470,7 +470,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCaptainUniform + group: LoadoutCaptainUniforms - !type:CharacterJobRequirement jobs: - Captain @@ -484,7 +484,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutCaptainUniform + group: LoadoutCaptainUniforms - !type:CharacterJobRequirement jobs: - Captain diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index 1190e9b36c6..281160d16d2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -171,7 +171,7 @@ tracker: JobHeadOfPersonnel min: 36000 # 10 hours - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelHeadId + group: LoadoutHeadOfPersonnelId - !type:CharacterJobRequirement jobs: - HeadOfPersonnel diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml index b0417010b3b..99482ca57b2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml @@ -203,7 +203,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutAtmosphericTechnicianUniform + group: LoadoutAtmosphericTechnicianUniforms - !type:CharacterJobRequirement jobs: - AtmosphericTechnician @@ -217,7 +217,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutAtmosphericTechnicianUniform + group: LoadoutAtmosphericTechnicianUniforms - !type:CharacterJobRequirement jobs: - AtmosphericTechnician diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml index 5fdb90b567d..db500b7ef7e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chiefEngineer.yml @@ -234,7 +234,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerUniform + group: LoadoutChiefEngineerUniforms - !type:CharacterJobRequirement jobs: - ChiefEngineer @@ -248,7 +248,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutChiefEngineerUniform + group: LoadoutChiefEngineerUniforms - !type:CharacterJobRequirement jobs: - ChiefEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml index f4c8869ccb3..a713ea78bb1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/chaplain.yml @@ -222,7 +222,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience + group: LoadoutChaplainUniforms - !type:CharacterJobRequirement jobs: - Chaplain @@ -236,7 +236,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience + group: LoadoutChaplainUniforms - !type:CharacterJobRequirement jobs: - Chaplain diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml index ee9a56c3258..c3396a4bdfd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/psionicMantis.yml @@ -27,7 +27,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience + group: LoadoutPsionicMantisOuter - !type:CharacterJobRequirement jobs: - ForensicMantis diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml index de64c466d38..43f8623fb05 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -261,7 +261,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutShoesScience + group: LoadoutEpistemicsShoes - !type:CharacterDepartmentRequirement departments: - Epistemics diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml index b5a3681440b..d3b88f9fa9d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml @@ -377,7 +377,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterMedical + group: LoadoutMedicalOuter - !type:CharacterJobRequirement jobs: - MedicalDoctor @@ -392,7 +392,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutOuterMedical + group: LoadoutMedicalOuter - !type:CharacterJobRequirement jobs: - MedicalDoctor @@ -411,7 +411,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutMedicalUniforms - !type:CharacterDepartmentRequirement departments: - Medical @@ -425,7 +425,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutMedicalUniforms - !type:CharacterDepartmentRequirement departments: - Medical @@ -439,7 +439,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutMedicalUniforms - !type:CharacterDepartmentRequirement departments: - Medical @@ -453,7 +453,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutMedicalUniforms - !type:CharacterDepartmentRequirement departments: - Medical @@ -467,7 +467,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutMedicalUniforms - !type:CharacterDepartmentRequirement departments: - Medical @@ -481,7 +481,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutMedicalUniforms - !type:CharacterDepartmentRequirement departments: - Medical @@ -495,7 +495,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical + group: LoadoutMedicalUniforms - !type:CharacterJobRequirement jobs: - MedicalDoctor diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index 7b96b9b40d5..0002bbb6565 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -315,7 +315,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -331,7 +331,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -344,7 +344,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -360,7 +360,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -373,7 +373,7 @@ cost: 0 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -389,7 +389,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -402,7 +402,7 @@ cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -418,7 +418,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -431,7 +431,7 @@ cost: 5 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -447,7 +447,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -460,7 +460,7 @@ cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -476,7 +476,7 @@ department: Security min: 108000 # 30 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -492,7 +492,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -511,7 +511,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -527,7 +527,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -543,7 +543,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -559,7 +559,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -572,7 +572,7 @@ cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -588,7 +588,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -601,7 +601,7 @@ cost: 3 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -617,7 +617,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -630,7 +630,7 @@ cost: 1 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -646,7 +646,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -659,7 +659,7 @@ cost: 2 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -675,7 +675,7 @@ department: Security min: 3600 # 1 hours - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security @@ -688,7 +688,7 @@ cost: 5 requirements: - !type:CharacterItemGroupRequirement - group: LoadoutSecurityWeapon + group: LoadoutSecurityWeapons - !type:CharacterDepartmentRequirement departments: - Security diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml index 20185b2289e..1b0bf68fb09 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml @@ -38,3 +38,30 @@ contents: - id: PillCryptobiolin amount: 5 + +- type: entity + name: chloral-hydrate + parent: Pill + id: PillChloralHydrate + description: A powerful sedative. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: ChloralHydrate + Quantity: 20 + +- type: entity + name: pill canister (Chloral-Hydrate 20u) + parent: PillCanister + id: PillCanisterChloralHydrate + suffix: ChloralHydrate, 5 + components: + - type: Label + currentLabel: ChloralHydrate 20u + - type: StorageFill + contents: + - id: PillChloralHydrate + amount: 5 From babc6115a34b4ff010345f7f2dc20ecfa33ab267 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 16:49:03 -0500 Subject: [PATCH 26/27] Last fixes --- .../loadouts/jobs/engineering/engineering.ftl | 19 +++++++++++++++---- .../en-US/loadouts/jobs/medical/medical.ftl | 18 ++++++++++++++---- .../Loadouts/Jobs/Command/headOfPersonnel.yml | 10 +++++----- .../Loadouts/Jobs/Medical/paramedic.yml | 4 ++-- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/Resources/Locale/en-US/loadouts/jobs/engineering/engineering.ftl b/Resources/Locale/en-US/loadouts/jobs/engineering/engineering.ftl index ea1e33ac81c..d9e0175fb7c 100644 --- a/Resources/Locale/en-US/loadouts/jobs/engineering/engineering.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/engineering/engineering.ftl @@ -4,8 +4,19 @@ loadout-description-LoadoutEngineeringUniformJumpskirtSenior = A skirt fit for t loadout-description-LoadoutEngineeringUniformJumpsuitSenior = A suit fit for the best of the best. loadout-description-LoadoutEngineeringItemInflatable = A box containing inflatable walls and doors, for quickly patching up breaches. -loadout-name-LoadoutEngineeringBeltUtility = utility belt (empty) -loadout-name-LoadoutEngineeringBeltUtilityEngineering = utility belt (filled, standard) -loadout-name-LoadoutEngineeringBeltUtilityAtmos = utility belt (filled, Atmospheric Tools) -loadout-description-LoadoutEngineeringBeltUtilityAtmos = +loadout-name-LoadoutAtmosphericTechnicianBeltUtility = utility belt (empty) +loadout-name-LoadoutAtmosphericTechnicianBeltUtilityAtmos = utility belt (filled, Atmospheric Tools) +loadout-description-LoadoutAtmosphericTechnicianBeltUtilityAtmos = + This standard engineering belt includes a holofan emitter, as well as a gas analyzer instead of a multitool. + +loadout-name-LoadoutChiefEngineerBelt = advanced utility belt (empty) +loadout-name-LoadoutChiefEngineerBeltFilled = advanced utility belt (filled) + +loadout-name-LoadoutSeniorEngineerBeltUtility = utility belt (empty) +loadout-name-LoadoutSeniorEngineerBeltUtilityEngineering = utility belt (filled) +loadout-name-LoadoutSeniorEngineerBeltUtilityAtmos = utility belt (filled, Atmospheric Tools) +loadout-description-LoadoutSeniorEngineerBeltUtilityAtmos = This standard engineering belt includes a holofan emitter, as well as a gas analyzer instead of a multitool. + +loadout-name-LoadoutEngineeringBeltUtilityAtmos = utility belt (filled, Atmospheric Tools) + diff --git a/Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl b/Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl index f810af49a6a..247f95edda9 100644 --- a/Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl @@ -2,8 +2,18 @@ loadout-description-LoadoutMedicalUniformJumpskirtSenior = A skirt fit for the b loadout-description-LoadoutMedicalUniformJumpsuitSenior = A suit fit for the best of the best. loadout-description-LoadoutMedicalHeadBeretSeniorPhysician = A beret fit for the best of the best. -loadout-name-LoadoutMedicalBeltMedical = medical belt (empty) -loadout-name-LoadoutMedicalBeltMedicalFilled = medical belt (filled) -loadout-name-LoadoutMedicalBeltMedicalAdvancedFilled = medical belt (filled, advanced) -loadout-description-LoadoutMedicalBeltMedicalAdvancedFilled = +loadout-name-LoadoutMedicalDoctorBeltMedical = medical belt (empty) +loadout-name-LoadoutMedicalDoctorBeltMedicalFilled = medical belt (filled) +loadout-name-LoadoutMedicalDoctorBeltMedicalAdvancedFilled = medical belt (filled, advanced) +loadout-description-LoadoutMedicalDoctorBeltMedicalAdvancedFilled = + The standard alotment of topical medicines in this pouch have been replaced with their advanced varieties, such as medicated sutures and regenerative mesh. + +loadout-name-LoadoutChiefMedicalOfficerBeltMedical = medical belt (empty) +loadout-name-LoadoutChiefMedicalOfficerBeltMedicalAdvancedFilled = medical belt (filled, advanced) +loadout-description-LoadoutChiefMedicalOfficerBeltMedicalAdvancedFilled = + The standard alotment of topical medicines in this pouch have been replaced with their advanced varieties, such as medicated sutures and regenerative mesh. + +loadout-name-LoadoutSeniorPhysicianBeltMedical = medical belt (empty) +loadout-name-LoadoutSeniorPhysicianBeltMedicalAdvancedFilled = medical belt (filled, advanced) +loadout-description-LoadoutSeniorPhysicianBeltMedicalAdvancedFilled = The standard alotment of topical medicines in this pouch have been replaced with their advanced varieties, such as medicated sutures and regenerative mesh. diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index 281160d16d2..fb2b2939066 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -345,7 +345,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelUniform + group: LoadoutHeadOfPersonnelUniforms - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -359,7 +359,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelUniform + group: LoadoutHeadOfPersonnelUniforms - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -373,7 +373,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelUniform + group: LoadoutHeadOfPersonnelUniforms - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -387,7 +387,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelUniform + group: LoadoutHeadOfPersonnelUniforms - !type:CharacterJobRequirement jobs: - HeadOfPersonnel @@ -401,7 +401,7 @@ exclusive: true requirements: - !type:CharacterItemGroupRequirement - group: LoadoutHeadOfPersonnelUniform + group: LoadoutHeadOfPersonnelUniforms - !type:CharacterJobRequirement jobs: - HeadOfPersonnel diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index 807233ba7ae..56082d35edd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -26,7 +26,7 @@ # Uniforms - type: loadout id: LoadoutMedicalUniformParamedicJumpsuit - category: JobsMedicalAUncategorized + category: JobsMedicalParamedic cost: 0 exclusive: true requirements: @@ -40,7 +40,7 @@ - type: loadout id: LoadoutMedicalUniformParamedicJumpskirt - category: JobsMedicalAUncategorized + category: JobsMedicalParamedic cost: 0 exclusive: true requirements: From de9051617aa711d9113214eb2a30e03cb7d2a2de Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 Nov 2024 16:52:45 -0500 Subject: [PATCH 27/27] LMAO --- Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml index fb2b2939066..474d9ab07ee 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/headOfPersonnel.yml @@ -163,7 +163,7 @@ # Id - type: loadout id: LoadoutHeadOfPersonnelNTPDA - category: JobsMedicalChiefMedicalOfficer + category: JobsCommandHeadOfPersonnel cost: 0 exclusive: true requirements: