diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 35087057a29..5c97ec022d6 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1230,6 +1230,16 @@ loadouts: - ChiefMedicalOfficerCloak - ChiefMedicalOfficerMantle +# Sunrise-start + - Sunrise-ScarfBlue + - Sunrise-ScarfRed + - Sunrise-ScarfOrange + - Sunrise-ScarfGreen + - Sunrise-ScarfLightBlue + - Sunrise-ScarfCyan + - Sunrise-ScarfBlue + - Sunrise-Stethoscope +# Sunrise-end - type: loadoutGroup id: ChiefMedicalOfficerShoes @@ -1289,6 +1299,14 @@ minLimit: 0 loadouts: - LatexGloves +# Sunrise-start + - Sunrise-WhiteGloves + - Sunrise-RedGloves + - Sunrise-GreenGloves + - Sunrise-TealGloves + - Sunrise-GlovesNitrileRed + - Sunrise-GlovesNitrileGreen +# Sunrise-end - NitrileGloves - type: loadoutGroup @@ -1296,7 +1314,16 @@ name: loadout-group-medical-mask minLimit: 0 loadouts: +# Sunrise-start + - Sunrise-MedicalSterileRed + - Sunrise-MedicalSterileGreen +# Sunrise-end - SterileMask +# Sunrise-start + - Sunrise-MedicalMaskRed + - Sunrise-MedicalMaskGreen + - Sunrise-MedicalMask +# Sunrise-end - type: loadoutGroup id: MedicalInternJumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 945fc73cc6b..ac82b22f729 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -647,9 +647,15 @@ groups: - GroupTankHarness - ChiefMedicalOfficerHead - - MedicalMask +# - MedicalMask #Sunrise-edit +# Sunrise-start + - SunriseChiefMedicalOfficerMask +# Sunrise-end - ChiefMedicalOfficerJumpsuit - - MedicalGloves +# Sunrise-start + - SunriseChiefMedicalOfficerGloves +# Sunrise-end +# - MedicalGloves #Sunrise-edit - MedicalBackpack - ChiefMedicalOfficerOuterClothing - ChiefMedicalOfficerNeck @@ -728,10 +734,11 @@ - GroupTankHarness # Sunrise-start - SunriseChemistHead + - SunriseChemistMask # Sunrise-end - - MedicalMask +# - MedicalMask #Sunrise-edit - ChemistJumpsuit -# - MedicalGloves +# - MedicalGloves #Sunrise-edit # Sunrise-start - SunriseChemistGloves # Sunrise-end @@ -740,7 +747,9 @@ # Sunrise-start - SunriseChemistNeck # Sunrise-end - - MedicalShoes + - SunriseChemistShoes + # Sunrise-end +# - MedicalShoes #Sunrise-edit - SurvivalMedical - Trinkets - GroupSpeciesBreathToolMedical @@ -757,9 +766,12 @@ groups: - GroupTankHarness - ParamedicHead - - MedicalMask +# - MedicalMask #Sunrise-edit + # Sunrise-start + - SunriseParamedicMask + # Sunrise-end - ParamedicJumpsuit -# - MedicalGloves +# - MedicalGloves #Sunrise-edit # Sunrise-start - SunriseParamedicGloves # Sunrise-end @@ -820,6 +832,7 @@ groups: # Sunrise-start - SunrisePsychologistHead + - MedicalMask - SunrisePsychologistGloves # Sunrise-end - CommonBackpack # Sunrise-edit diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml index ab6ac0f895f..bee4ca6c5f6 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml @@ -136,6 +136,17 @@ #Neck + +- type: loadout + id: Sunrise-ScarfBlack + equipment: + neck: ClothingNeckScarfStripedBlack + +- type: loadout + id: Sunrise-ScarfGreen + equipment: + neck: ClothingNeckScarfStripedGreen + - type: loadout id: Sunrise-ScarfRed equipment: @@ -265,6 +276,11 @@ equipment: outerClothing: ClothingOuterWinterColorCyan +- type: loadout + id: Sunrise-WinterColorBlack + equipment: + outerClothing: ClothingOuterWinterColorBlack + #Shoes - type: loadout @@ -312,7 +328,12 @@ equipment: shoes: ClothingShoesLeather -#gloves +# Gloves + +- type: loadout + id: Sunrise-BlackGloves + equipment: + gloves: ClothingHandsGlovesColorBlack - type: loadout id: Sunrise-RedGloves diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/medical.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/medical.yml index 58117fbdcb5..0490e22fb58 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/medical.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/medical.yml @@ -170,7 +170,6 @@ equipment: mask: ClothingMaskBreathMedicalBlack - - type: loadout id: Sunrise-MedicalMaskBlue equipment: @@ -197,7 +196,7 @@ mask: ClothingMaskSterileOrange - type: loadout - id: Sunrise-MedicalMaskBlue + id: Sunrise-MedicalSterileRed equipment: mask: ClothingMaskSterileRed @@ -228,23 +227,6 @@ equipment: gloves: ClothingHandsGlovesNitrileBlue -#Head - -- type: loadout - id: Sunrise-SurgcapBlue - equipment: - Head: ClothingHeadHatSurgcapBlue - -- type: loadout - id: Sunrise-SurgcapGreen - equipment: - Head: ClothingHeadHatSurgcapGreen - -- type: loadout - id: Sunrise-SurgcapPurple - equipment: - Head: ClothingHeadHatSurgcapPurple - diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index dfa39eff4a7..bbea8506517 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -198,6 +198,8 @@ - JumpsuitSeniorResearcher - JumpskirtSeniorResearcher +# Medical + - type: loadoutGroup id: SeniorPhysicianJumpsuit name: loadout-group-senior-physician-jumpsuit @@ -212,158 +214,349 @@ - BeltMedicalSeniorPhysician - ChemBagSeniorPhysician - - - - - type: loadoutGroup id: SunriseChiefMedicalOfficerMask name: loadout-group-chief-medical-officer-mask + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-MedicalSterileBlack + - Sunrise-MedicalSterileRed + - Sunrise-MedicalSterileOrange + - Sunrise-MedicalSterileGreen + - SterileMask + - Sunrise-MedicalSterileBlue + - Sunrise-MedicalMaskBlack + - Sunrise-MedicalMaskRed + - Sunrise-MedicalMaskOrange + - Sunrise-MedicalMaskGreen + - Sunrise-MedicalMask + - Sunrise-MedicalMaskBlue - type: loadoutGroup id: SunriseChiefMedicalOfficerGloves name: loadout-group-chief-medical-officer-gloves + minLimit: 0 + maxLimit: 1 loadouts: + - LatexGloves + - Sunrise-BlackGloves + - Sunrise-WhiteGloves + - Sunrise-RedGloves + - Sunrise-GreenGloves + - Sunrise-TealGloves + - Sunrise-BlueGloves + - Sunrise-GlovesNitrileBlack + - Sunrise-GlovesNitrileRed + - Sunrise-GlovesNitrileOrange + - Sunrise-GlovesNitrileGreen + - NitrileGloves + - Sunrise-GlovesNitrileBlue - type: loadoutGroup id: SeniorPhysicianHead name: loadout-group-senior-physician-head + minLimit: 0 + maxLimit: 1 loadouts: - type: loadoutGroup id: SeniorPhysicianOuterClothing name: loadout-group-senior-physician-outerclothing + minLimit: 0 + maxLimit: 1 loadouts: - - type: loadoutGroup id: SeniorPhysicianNeck name: loadout-group-senior-physician-neck + minLimit: 0 + maxLimit: 1 loadouts: - + - Sunrise-ScarfBlack + - Sunrise-ScarfRed + - Sunrise-ScarfOrange + - Sunrise-ScarfGreen + - Sunrise-ScarfLightBlue + - Sunrise-ScarfCyan + - Sunrise-ScarfBlue + - Sunrise-Stethoscope - type: loadoutGroup id: SeniorPhysicianMask name: loadout-group-senior-physician-mask + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-MedicalSterileBlack + - Sunrise-MedicalSterileRed + - Sunrise-MedicalSterileOrange + - Sunrise-MedicalSterileGreen + - SterileMask + - Sunrise-MedicalSterileBlue + - Sunrise-MedicalMaskBlack + - Sunrise-MedicalMaskRed + - Sunrise-MedicalMaskOrange + - Sunrise-MedicalMaskGreen + - Sunrise-MedicalMask + - Sunrise-MedicalMaskBlue - type: loadoutGroup id: SeniorPhysicianShoes name: loadout-group-senior-physician-shoes + minLimit: 1 + maxLimit: 1 loadouts: - type: loadoutGroup id: SeniorPhysicianGloves name: loadout-group-senior-physician-gloves + minLimit: 0 + maxLimit: 1 loadouts: + - LatexGloves + - Sunrise-BlackGloves + - Sunrise-WhiteGloves + - Sunrise-RedGloves + - Sunrise-GreenGloves + - Sunrise-TealGloves + - Sunrise-BlueGloves + - Sunrise-GlovesNitrileBlack + - Sunrise-GlovesNitrileRed + - Sunrise-GlovesNitrileOrange + - Sunrise-GlovesNitrileGreen + - NitrileGloves + - Sunrise-GlovesNitrileBlue - type: loadoutGroup id: SunriseChemistHead name: loadout-group-chemist-head + minLimit: 0 + maxLimit: 1 loadouts: - type: loadoutGroup id: SunriseChemistNeck name: loadout-group-chemist-neck + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-ScarfRed + - Sunrise-ScarfOrange + - Sunrise-ScarfGreen + - Sunrise-ScarfLightBlue + - Sunrise-ScarfCyan + - Sunrise-Stethoscope - type: loadoutGroup id: SunriseChemistMask name: loadout-group-chemist-mask + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-MedicalSterileRed + - Sunrise-MedicalMaskOrange + - Sunrise-MedicalSterileGreen + - SterileMask + - Sunrise-MedicalMaskRed + - Sunrise-MedicalMaskOrange + - Sunrise-MedicalMaskGreen + - Sunrise-MedicalMask + - type: loadoutGroup id: SunriseChemistGloves name: loadout-group-chemist-gloves + minLimit: 0 + maxLimit: 1 loadouts: + - LatexGloves + - Sunrise-WhiteGloves + - Sunrise-RedGloves + - Sunrise-GreenGloves + - Sunrise-TealGloves + - Sunrise-GlovesNitrileRed + - Sunrise-GlovesNitrileOrange + - Sunrise-GlovesNitrileGreen + - NitrileGloves - type: loadoutGroup id: SunriseChemistShoes name: loadout-group-chemist-shoes + minLimit: 1 + maxLimit: 1 loadouts: - type: loadoutGroup id: SunrisePsychologistHead name: loadout-group-psychologist-head + minLimit: 0 + maxLimit: 1 loadouts: - type: loadoutGroup id: SunrisePsychologistOuterClothing name: loadout-group-psychologist-outerclothing + minLimit: 0 + maxLimit: 1 loadouts: - type: loadoutGroup id: SunrisePsychologistNeck name: loadout-group-psychologist-neck + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-ScarfLightBlue + - Sunrise-ScarfCyan - type: loadoutGroup id: SunrisePsychologistMask name: loadout-group-psychologist-mask + minLimit: 0 + maxLimit: 1 loadouts: + - SterileMask + - Sunrise-MedicalMask - type: loadoutGroup id: SunrisePsychologistGloves name: loadout-group-psychologist-gloves + minLimit: 0 + maxLimit: 1 loadouts: + - LatexGloves + - Sunrise-WhiteGloves + - NitrileGloves - type: loadoutGroup id: SunrisePsychologistShoes name: loadout-group-psychologist-shoes + minLimit: 1 + maxLimit: 1 loadouts: - type: loadoutGroup id: SunriseMedicalDoctorNeck name: loadout-group-medical-doctor-neck + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-ScarfRed + - Sunrise-ScarfGreen + - Sunrise-ScarfLightBlue + - Sunrise-ScarfCyan + - Sunrise-Stethoscope - type: loadoutGroup id: SunriseParamedicNeck name: loadout-group-paramedic-neck + minLimit: 0 + maxLimit: 1 loadouts: - + - Sunrise-ScarfRed + - Sunrise-ScarfGreen + - Sunrise-ScarfLightBlue + - Sunrise-ScarfCyan + - Sunrise-ScarfBlue + - Sunrise-Stethoscope - type: loadoutGroup id: SunriseParamedicMask name: loadout-group-paramedic-mask + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-MedicalSterileRed + - Sunrise-MedicalSterileGreen + - SterileMask + - Sunrise-MedicalSterileBlue + - Sunrise-MedicalMaskRed + - Sunrise-MedicalMaskGreen + - Sunrise-MedicalMask + - Sunrise-MedicalMaskBlue - type: loadoutGroup id: SunriseParamedicGloves name: loadout-group-paramedic-gloves + minLimit: 0 + maxLimit: 1 loadouts: + - LatexGloves + - Sunrise-WhiteGloves + - Sunrise-RedGloves + - Sunrise-GreenGloves + - Sunrise-TealGloves + - Sunrise-BlueGloves + - Sunrise-GlovesNitrileRed + - Sunrise-GlovesNitrileGreen + - NitrileGloves + - Sunrise-GlovesNitrileBlue - type: loadoutGroup id: PathologistHead name: loadout-group-pathologist-head + minLimit: 0 + maxLimit: 1 loadouts: - type: loadoutGroup id: PathologistOuterClothing name: loadout-group-pathologist-outerclothing + minLimit: 0 + maxLimit: 1 loadouts: - type: loadoutGroup id: PathologistNeck name: loadout-group-pathologist-neck + minLimit: 0 + maxLimit: 1 loadouts: - -- type: loadoutGroup - id: PathologistNeck - name: loadout-group-pathologist-neck - loadouts: + - Sunrise-ScarfLightBlue + - Sunrise-ScarfCyan + - Sunrise-ScarfBlack + - Sunrise-Stethoscope - type: loadoutGroup id: PathologistMask name: loadout-group-pathologist-mask + minLimit: 0 + maxLimit: 1 loadouts: + - Sunrise-MedicalSterileBlack + - Sunrise-MedicalMaskRed + - Sunrise-MedicalSterileGreen + - SterileMask + - Sunrise-MedicalMaskBlack + - Sunrise-MedicalSterileRed + - Sunrise-MedicalMaskGreen + - Sunrise-MedicalMask - type: loadoutGroup id: PathologistShoes name: loadout-group-pathologist-shoes + minLimit: 1 + maxLimit: 1 loadouts: +- type: loadoutGroup + id: PathologistGloves + name: loadout-group-pathologist-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - LatexGloves + - Sunrise-BlackGloves + - Sunrise-WhiteGloves + - Sunrise-RedGloves + - Sunrise-GreenGloves + - Sunrise-TealGloves + - Sunrise-GlovesNitrileBlack + - Sunrise-GlovesNitrileRed + - Sunrise-GlovesNitrileGreen + - NitrileGloves + - type: loadoutGroup id: MedicalTrinkets name: loadout-group-medical-trinkets @@ -382,13 +575,6 @@ - TrinketsMedicalTFCMO - TrinketsMedicalCNSG - - - - - - - - type: loadoutGroup id: SeniorEngineerJumpsuit name: loadout-group-senior-engineer-jumpsuit