Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buncha loadout stuff from drobes + trooper set in secdrobe #291

Merged
merged 1 commit into from
Sep 19, 2024
Merged

buncha loadout stuff from drobes + trooper set in secdrobe #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
ClothingShoesBootsJack: 3
ClothingHeadHatBeretSecurity: 3
ClothingHeadHatSecsoft: 3
ClothingHeadHatSecurityTrooper: 3
ClothingHeadBandRed: 3
ClothingMaskNeckGaiterRed: 3
ClothingHandsGlovesColorBlack: 3
Expand All @@ -16,6 +17,7 @@
ClothingUniformJumpsuitSecGrey: 3
ClothingUniformJumpskirtSecGrey: 3
ClothingUniformJumpsuitSecBlue: 3
ClothingUniformSecurityTrooper: 3
ClothingHeadsetSecurity: 3
ClothingOuterWinterSec: 2
ClothingOuterArmorBasic: 2
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@
id: ChefWintercoat
equipment:
outerClothing: ClothingOuterWinterChef

# Shoes
- type: loadout
id: ChefShoes
equipment:
shoes: ClothingShoesChef

5 changes: 5 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
equipment:
jumpsuit: ClothingUniformJumpskirtRoboticist

- type: loadout
id: ScientistJumpsuitFormal
equipment:
jumpsuit: ClothingUniformJumpsuitScientistFormal

- type: loadout
id: SeniorResearcherJumpsuit
effects:
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,8 @@
id: DetectiveCoat
equipment:
outerClothing: ClothingOuterCoatDetectiveLoadout

- type: loadout
id: NoirCoat
equipment:
outerClothing: ClothingOuterCoatDetectiveLoadoutGrey
5 changes: 5 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
equipment:
jumpsuit: ClothingUniformSecurityTrooper

- type: loadout
id: SecurityJumpsuitBlue
equipment:
jumpsuit: ClothingUniformJumpsuitSecBlue

- type: loadout
id: SeniorOfficerJumpsuit
effects:
Expand Down
13 changes: 12 additions & 1 deletion Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -879,6 +886,7 @@
- ScientistJumpskirt
- RoboticistJumpsuit
- RoboticistJumpskirt
- ScientistJumpsuitFormal
- SeniorResearcherJumpsuit
- SeniorResearcherJumpskirt

Expand Down Expand Up @@ -982,6 +990,7 @@
loadouts:
- WardenJumpsuit
- WardenJumpskirt
- SecurityJumpsuitBlue

- type: loadoutGroup
id: WardenOuterClothing
Expand All @@ -1008,9 +1017,10 @@
- SecurityJumpskirt
- SecurityJumpsuitGrey
- SecurityJumpskirtGrey
- TrooperUniform
- SecurityJumpsuitBlue
- SeniorOfficerJumpsuit
- SeniorOfficerJumpskirt
- TrooperUniform

- type: loadoutGroup
id: SecurityBackpack
Expand Down Expand Up @@ -1080,6 +1090,7 @@
loadouts:
- DetectiveArmorVest
- DetectiveCoat
- NoirCoat

- type: loadoutGroup
id: SecurityCadetJumpsuit
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
- ChefJumpsuit
- CommonBackpack
- ChefOuterClothing
- ChefShoes
- Glasses
- Survival
- Trinkets
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
- type: startingGear
id: ChefGear
equipment:
shoes: ClothingShoesColorBlack
id: ChefPDA
ears: ClothingHeadsetService
belt: ClothingBeltChefFilled
Expand Down
Loading