From: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Thu, 18 Apr 2024 23:38:17 +0000 (-0400) Subject: add roboticist gear to science loadout (#27045) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c8202dd80d0907de09f4400b297a6bb052af9d72;p=space-station-14.git add roboticist gear to science loadout (#27045) * inital * yes * g * death * DEATH --- diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 2f35d59330..e8ebb67ef3 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -121,6 +121,7 @@ loadout-group-scientist-neck = Scientist neck loadout-group-scientist-jumpsuit = Scientist jumpsuit loadout-group-scientist-backpack = Scientist backpack loadout-group-scientist-outerclothing = Scientist outer clothing +loadout-group-scientist-gloves = Scientist gloves loadout-group-scientist-shoes = Scientist shoes loadout-group-scientist-id = Scientist ID diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index fd0a24d774..1964acbb02 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -29,29 +29,29 @@ # Gloves - type: loadout - id: JanitorGlovesRubber - equipment: JanitorGlovesRubber + id: JanitorRubberGloves + equipment: JanitorRubberGloves - type: startingGear - id: JanitorGlovesRubber + id: JanitorRubberGloves equipment: gloves: ClothingHandsGlovesJanitor - type: loadout - id: JanitorGlovesOrange - equipment: JanitorGlovesOrange + id: OrangeGloves + equipment: OrangeGloves - type: startingGear - id: JanitorGlovesOrange + id: OrangeGloves equipment: gloves: ClothingHandsGlovesColorOrange - type: loadout - id: JanitorGlovesPurple - equipment: JanitorGlovesPurple + id: PurpleGloves + equipment: PurpleGloves - type: startingGear - id: JanitorGlovesPurple + id: PurpleGloves equipment: gloves: ClothingHandsGlovesColorPurple diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index f263d7fdb9..c03ae4cfbc 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -22,6 +22,24 @@ equipment: head: ClothingHeadHatBeretRND +- type: loadout + id: RoboticistCap + equipment: RoboticistCap + +- type: startingGear + id: RoboticistCap + equipment: + head: ClothingHeadHatCorpsoft + +- type: loadout + id: SkullBandana + equipment: SkullBandana + +- type: startingGear + id: SkullBandana + equipment: + head: ClothingHeadBandSkull + # Neck - type: loadout @@ -52,6 +70,24 @@ equipment: jumpsuit: ClothingUniformJumpskirtScientist +- type: loadout + id: RoboticistJumpsuit + equipment: RoboticistJumpsuit + +- type: startingGear + id: RoboticistJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitRoboticist + +- type: loadout + id: RoboticistJumpskirt + equipment: RoboticistJumpskirt + +- type: startingGear + id: RoboticistJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtRoboticist + - type: loadout id: SeniorResearcherJumpsuit equipment: SeniorResearcherJumpsuit @@ -132,6 +168,24 @@ equipment: outerClothing: ClothingOuterWinterSci +- type: loadout + id: RoboticistLabCoat + equipment: RoboticistLabCoat + +- type: startingGear + id: RoboticistLabCoat + equipment: + outerClothing: ClothingOuterCoatRobo + +- type: loadout + id: RoboticistWintercoat + equipment: RoboticistWintercoat + +- type: startingGear + id: RoboticistWintercoat + equipment: + outerClothing: ClothingOuterWinterRobo + - type: loadout id: SeniorResearcherLabCoat equipment: SeniorResearcherLabCoat @@ -144,6 +198,25 @@ equipment: outerClothing: ClothingOuterCoatLabSeniorResearcher +# Gloves +- type: loadout + id: LatexGloves + equipment: LatexGloves + +- type: startingGear + id: LatexGloves + equipment: + gloves: ClothingHandsGlovesLatex + +- type: loadout + id: RobohandsGloves + equipment: RobohandsGloves + +- type: startingGear + id: RobohandsGloves + equipment: + gloves: ClothingHandsGlovesRobohands + # Shoes - type: loadout id: ScienceWinterBoots diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index dacfc9fd03..222c598e05 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -300,9 +300,9 @@ name: loadout-group-janitor-gloves minLimit: 0 loadouts: - - JanitorGlovesRubber - - JanitorGlovesOrange - - JanitorGlovesPurple + - JanitorRubberGloves + - OrangeGloves + - PurpleGloves - type: loadoutGroup id: JanitorOuterClothing @@ -727,6 +727,8 @@ name: loadout-group-scientist-head minLimit: 0 loadouts: + - RoboticistCap + - SkullBandana - ScientificBeret - type: loadoutGroup @@ -742,6 +744,8 @@ loadouts: - ScientistJumpsuit - ScientistJumpskirt + - RoboticistJumpsuit + - RoboticistJumpskirt - SeniorResearcherJumpsuit - SeniorResearcherJumpskirt @@ -761,6 +765,8 @@ - RegularLabCoat - ScienceLabCoat - ScienceWintercoat + - RoboticistLabCoat + - RoboticistWintercoat - SeniorResearcherLabCoat - type: loadoutGroup @@ -768,8 +774,18 @@ name: loadout-group-scientist-shoes loadouts: - WhiteShoes + - BlackShoes - ScienceWinterBoots +- type: loadoutGroup + id: ScientistGloves + name: loadout-group-scientist-gloves + minLimit: 0 + loadouts: + - LatexGloves + - PurpleGloves + - RobohandsGloves + - type: loadoutGroup id: ScientistPDA name: loadout-group-scientist-id diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 533ff38c11..b5e19147b1 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -207,6 +207,7 @@ - ResearchDirectorJumpsuit - ResearchDirectorBackpack - ResearchDirectorOuterClothing + - ScientistGloves - ResearchDirectorShoes - Trinkets @@ -218,6 +219,7 @@ - ScientistJumpsuit - ScientistBackpack - ScientistOuterClothing + - ScientistGloves - ScientistShoes - ScientistPDA - Trinkets