From e1d68dff12ca76c6b06279ebc6c8ca0d964bd0de Mon Sep 17 00:00:00 2001 From: Darkmajia Date: Thu, 19 Sep 2024 11:10:42 +0100 Subject: [PATCH] buncha loadout stuff + secdrobe --- .../Locale/en-US/preferences/loadout-groups.ftl | 1 + .../VendingMachines/Inventories/secdrobe.yml | 2 ++ .../Prototypes/Loadouts/Jobs/Civilian/chef.yml | 7 +++++++ .../Prototypes/Loadouts/Jobs/Science/scientist.yml | 5 +++++ .../Prototypes/Loadouts/Jobs/Security/detective.yml | 5 +++++ .../Loadouts/Jobs/Security/security_officer.yml | 5 +++++ Resources/Prototypes/Loadouts/loadout_groups.yml | 13 ++++++++++++- Resources/Prototypes/Loadouts/role_loadouts.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/chef.yml | 1 - 9 files changed, 38 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index e1154e3856dcad..151fa6db709dea 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -48,6 +48,7 @@ loadout-group-chef-head = Chef head loadout-group-chef-mask = Chef mask loadout-group-chef-jumpsuit = Chef jumpsuit loadout-group-chef-outerclothing = Chef outer clothing +loadout-group-chef-shoes = Chef shoes loadout-group-librarian-jumpsuit = Librarian jumpsuit diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index c6f44d56bce9fe..7f0beb16cd80dd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -8,6 +8,7 @@ ClothingShoesBootsJack: 3 ClothingHeadHatBeretSecurity: 3 ClothingHeadHatSecsoft: 3 + ClothingHeadHatSecurityTrooper: 3 ClothingHeadBandRed: 3 ClothingMaskNeckGaiterRed: 3 ClothingHandsGlovesColorBlack: 3 @@ -16,6 +17,7 @@ ClothingUniformJumpsuitSecGrey: 3 ClothingUniformJumpskirtSecGrey: 3 ClothingUniformJumpsuitSecBlue: 3 + ClothingUniformSecurityTrooper: 3 ClothingHeadsetSecurity: 3 ClothingOuterWinterSec: 2 ClothingOuterArmorBasic: 2 diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 5cfa76d4a73be3..1f7d3402f8923c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -36,3 +36,10 @@ id: ChefWintercoat equipment: outerClothing: ClothingOuterWinterChef + +# Shoes +- type: loadout + id: ChefShoes + equipment: + shoes: ClothingShoesChef + diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index e89802e9c12f57..a2978ddc703c8f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -59,6 +59,11 @@ equipment: jumpsuit: ClothingUniformJumpskirtRoboticist +- type: loadout + id: ScientistJumpsuitFormal + equipment: + jumpsuit: ClothingUniformJumpsuitScientistFormal + - type: loadout id: SeniorResearcherJumpsuit effects: diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index e8afa5a203ca61..1def05470ff8c1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -46,3 +46,8 @@ id: DetectiveCoat equipment: outerClothing: ClothingOuterCoatDetectiveLoadout + +- type: loadout + id: NoirCoat + equipment: + outerClothing: ClothingOuterCoatDetectiveLoadoutGrey diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 6cc0dedf722dc0..dfc0dec2f7095f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -70,6 +70,11 @@ equipment: jumpsuit: ClothingUniformSecurityTrooper +- type: loadout + id: SecurityJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitSecBlue + - type: loadout id: SeniorOfficerJumpsuit effects: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index e418577c5bb2b5..a80ec6cb2d21c4 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -266,6 +266,13 @@ - ChefJacket - ChefWintercoat +- type: loadoutGroup + id: ChefShoes + name: loadout-group-chef-shoes + loadouts: + - BlackShoes + - ChefShoes + - type: loadoutGroup id: LibrarianJumpsuit name: loadout-group-librarian-jumpsuit @@ -879,6 +886,7 @@ - ScientistJumpskirt - RoboticistJumpsuit - RoboticistJumpskirt + - ScientistJumpsuitFormal - SeniorResearcherJumpsuit - SeniorResearcherJumpskirt @@ -982,6 +990,7 @@ loadouts: - WardenJumpsuit - WardenJumpskirt + - SecurityJumpsuitBlue - type: loadoutGroup id: WardenOuterClothing @@ -1008,9 +1017,10 @@ - SecurityJumpskirt - SecurityJumpsuitGrey - SecurityJumpskirtGrey + - TrooperUniform + - SecurityJumpsuitBlue - SeniorOfficerJumpsuit - SeniorOfficerJumpskirt - - TrooperUniform - type: loadoutGroup id: SecurityBackpack @@ -1080,6 +1090,7 @@ loadouts: - DetectiveArmorVest - DetectiveCoat + - NoirCoat - type: loadoutGroup id: SecurityCadetJumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 15d75a304111e0..4418cb1a879961 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -81,6 +81,7 @@ - ChefJumpsuit - CommonBackpack - ChefOuterClothing + - ChefShoes - Glasses - Survival - Trinkets diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 5abb1d4c8edcfb..8ff3780cf4ebfe 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -21,7 +21,6 @@ - type: startingGear id: ChefGear equipment: - shoes: ClothingShoesColorBlack id: ChefPDA ears: ClothingHeadsetService belt: ClothingBeltChefFilled