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.

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

Loadouts: fix Lawyer, Janitor slot names, remove Chaplain loadout #1468

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
- type: roleLoadout
id: JobLawyer
groups:
- LawyerNeck
- LawyerJumpsuit
- LawyerNFNeck # Frontier
- LawyerNFJumpsuit # Frontier
- ContractorBackpack
- ContractorGlasses
- ContractorFace
Expand Down Expand Up @@ -103,11 +103,11 @@
- type: roleLoadout
id: JobJanitor
groups:
- JanitorHead
- JanitorJumpsuit
- JanitorGloves
- JanitorNFHead # Frontier
- JanitorNFJumpsuit # Frontier
- JanitorNFGloves # Frontier
- ContractorBackpack
- JanitorOuterClothing
- JanitorNFOuterClothing # Frontier
- ContractorFace
- ContractorGlasses
- ContractorBoxSurvival
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
name: job-name-chaplain
description: job-description-chaplain
playTimeTracker: JobChaplain
setPreference: false # Frontier
requirements:
- !type:OverallPlaytimeRequirement
time: 10800
Expand Down
26 changes: 26 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/gloves.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- type: loadout
id: JanitorClothingHandsGlovesJanitor
equipment: JanitorClothingHandsGlovesJanitor

- type: startingGear
id: JanitorClothingHandsGlovesJanitor
equipment:
gloves: ClothingHandsGlovesJanitor

- type: loadout
id: JanitorClothingHandsGlovesColorOrange
equipment: JanitorClothingHandsGlovesColorOrange

- type: startingGear
id: JanitorClothingHandsGlovesColorOrange
equipment:
gloves: ClothingHandsGlovesColorOrange

- type: loadout
id: JanitorClothingHandsGlovesColorPurple
equipment: JanitorClothingHandsGlovesColorPurple

- type: startingGear
id: JanitorClothingHandsGlovesColorPurple
equipment:
gloves: ClothingHandsGlovesColorPurple
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/head.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: loadout
id: JanitorClothingHeadHatPurplesoft
equipment: JanitorClothingHeadHatPurplesoft

- type: startingGear
id: JanitorClothingHeadHatPurplesoft
equipment:
head: ClothingHeadHatPurplesoft
17 changes: 17 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/jumpsuit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: loadout
id: JanitorClothingUniformJumpsuitJanitor
equipment: JanitorClothingUniformJumpsuitJanitor

- type: startingGear
id: JanitorClothingUniformJumpsuitJanitor
equipment:
jumpsuit: ClothingUniformJumpsuitJanitor

- type: loadout
id: JanitorClothingUniformJumpskirtJanitor
equipment: JanitorClothingUniformJumpskirtJanitor

- type: startingGear
id: JanitorClothingUniformJumpskirtJanitor
equipment:
jumpsuit: ClothingUniformJumpskirtJanitor
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/outer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: loadout
id: JanitorClothingOuterWinterJani
equipment: JanitorClothingOuterWinterJani

- type: startingGear
id: JanitorClothingOuterWinterJani
equipment:
outerClothing: ClothingOuterWinterJani
89 changes: 89 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Lawyer/jumpsuit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
- type: loadout
id: LawyerClothingUniformJumpsuitLawyerBlack
equipment: LawyerClothingUniformJumpsuitLawyerBlack

- type: startingGear
id: LawyerClothingUniformJumpsuitLawyerBlack
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerBlack

- type: loadout
id: LawyerClothingUniformJumpskirtLawyerBlack
equipment: LawyerClothingUniformJumpskirtLawyerBlack

- type: startingGear
id: LawyerClothingUniformJumpskirtLawyerBlack
equipment:
jumpsuit: ClothingUniformJumpskirtLawyerBlack

- type: loadout
id: LawyerClothingUniformJumpsuitLawyerBlue
equipment: LawyerClothingUniformJumpsuitLawyerBlue

- type: startingGear
id: LawyerClothingUniformJumpsuitLawyerBlue
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerBlue

- type: loadout
id: LawyerClothingUniformJumpskirtLawyerBlue
equipment: LawyerClothingUniformJumpskirtLawyerBlue

- type: startingGear
id: LawyerClothingUniformJumpskirtLawyerBlue
equipment:
jumpsuit: ClothingUniformJumpskirtLawyerBlue

- type: loadout
id: LawyerClothingUniformJumpsuitLawyerPurple
equipment: LawyerClothingUniformJumpsuitLawyerPurple

- type: startingGear
id: LawyerClothingUniformJumpsuitLawyerPurple
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerPurple

- type: loadout
id: LawyerClothingUniformJumpskirtLawyerPurple
equipment: LawyerClothingUniformJumpskirtLawyerPurple

- type: startingGear
id: LawyerClothingUniformJumpskirtLawyerPurple
equipment:
jumpsuit: ClothingUniformJumpskirtLawyerPurple

- type: loadout
id: LawyerClothingUniformJumpsuitLawyerRed
equipment: LawyerClothingUniformJumpsuitLawyerRed

- type: startingGear
id: LawyerClothingUniformJumpsuitLawyerRed
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerRed

- type: loadout
id: LawyerClothingUniformJumpskirtLawyerRed
equipment: LawyerClothingUniformJumpskirtLawyerRed

- type: startingGear
id: LawyerClothingUniformJumpskirtLawyerRed
equipment:
jumpsuit: ClothingUniformJumpskirtLawyerRed

- type: loadout
id: LawyerClothingUniformJumpsuitLawyerGood
equipment: LawyerClothingUniformJumpsuitLawyerGood

- type: startingGear
id: LawyerClothingUniformJumpsuitLawyerGood
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerGood

- type: loadout
id: LawyerClothingUniformJumpskirtLawyerGood
equipment: LawyerClothingUniformJumpskirtLawyerGood

- type: startingGear
id: LawyerClothingUniformJumpskirtLawyerGood
equipment:
jumpsuit: ClothingUniformJumpskirtLawyerGood
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Lawyer/neck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: loadout
id: LawyerClothingNeckLawyerbadge
equipment: LawyerClothingNeckLawyerbadge

- type: startingGear
id: LawyerClothingNeckLawyerbadge
equipment:
neck: ClothingNeckLawyerbadge
29 changes: 29 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- type: loadoutGroup
id: JanitorNFHead
name: loadout-group-contractor-head
minLimit: 0
loadouts:
- JanitorClothingHeadHatPurplesoft

- type: loadoutGroup
id: JanitorNFJumpsuit
name: loadout-group-contractor-jumpsuit
loadouts:
- JanitorClothingUniformJumpsuitJanitor
- JanitorClothingUniformJumpskirtJanitor

- type: loadoutGroup
id: JanitorNFGloves
name: loadout-group-contractor-gloves
minLimit: 0
loadouts:
- JanitorClothingHandsGlovesJanitor
- JanitorClothingHandsGlovesColorOrange
- JanitorClothingHandsGlovesColorPurple

- type: loadoutGroup
id: JanitorNFOuterClothing
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- JanitorClothingOuterWinterJani
21 changes: 21 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/lawyer_loadout_groups.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- type: loadoutGroup
id: LawyerNFNeck
name: loadout-group-contractor-neck
minLimit: 0
loadouts:
- LawyerClothingNeckLawyerbadge

- type: loadoutGroup
id: LawyerNFJumpsuit
name: loadout-group-contractor-jumpsuit
loadouts:
- LawyerClothingUniformJumpsuitLawyerBlack
- LawyerClothingUniformJumpskirtLawyerBlack
- LawyerClothingUniformJumpsuitLawyerBlue
- LawyerClothingUniformJumpskirtLawyerBlue
- LawyerClothingUniformJumpsuitLawyerPurple
- LawyerClothingUniformJumpskirtLawyerPurple
- LawyerClothingUniformJumpsuitLawyerRed
- LawyerClothingUniformJumpskirtLawyerRed
- LawyerClothingUniformJumpsuitLawyerGood
- LawyerClothingUniformJumpskirtLawyerGood
Loading