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

Jump to bottom

Move tank harness to outer clothing #2028

Merged
merged 10 commits into from
Sep 20, 2024
Merged

Move tank harness to outer clothing #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3ca422f
Move tank harness to outer clothing
whatston3 Sep 17, 2024
556779c
Valet outer clothing fixes
whatston3 Sep 17, 2024
dc5e07a
Fix valet outer clothing
whatston3 Sep 17, 2024
23d5d90
outerclothing, not jumpsuit
whatston3 Sep 17, 2024
bb981d9
Fix pirate outer clothing
whatston3 Sep 17, 2024
d5725fe
tank: hideEffects, not effects
whatston3 Sep 17, 2024
a883982
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
whatston3 Sep 18, 2024
24c22a8
Merge branch 'master' into 2024-09-17-vox-loadouts
dvir001 Sep 19, 2024
a8857c2
Fix mercenary loadouts: remove tank harness
whatston3 Sep 19, 2024
79870a6
Merge branch 'master' into 2024-09-17-vox-loadouts
dvir001 Sep 20, 2024
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
15 changes: 5 additions & 10 deletions Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,15 @@
holiday: FrontierBirthday # Frontier
prototype: FrontierBirthdayGift # Frontier

# Frontier: valet loadout
- type: startingGear
id: ValetGear
equipment:
head: ClothingHeadHatBellhop
# jumpsuit: ClothingUniformJumpsuitValet
outerClothing: ClothingOuterVestValet
gloves: ClothingHandsGlovesColorWhite
id: ValetPDA
# ears: ClothingHeadsetService # Frontier
# innerClothingSkirt: ClothingUniformJumpskirtValet
# satchel: ClothingBackpackSatchelFilled
# duffelbag: ClothingBackpackDuffelFilled
# messenger: ClothingBackpackMessengerFilled # Frontier
storage: # Frontier
back: # Frontier
storage:
back:
- EncryptionKeyService # Frontier
- ShipVoucherFrontierValet # Frontier
- ShipVoucherFrontierValet
# End Frontier
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
- type: loadout
id: ContractorClothingOuterVestTank
price: 0
hideEffects:
- !type:GroupLoadoutEffect
proto: EffectSpeciesVox
equipment:
outerClothing: ClothingOuterVestTank

- type: loadout
id: ContractorClothingOuterSuitEmergency
price: 800
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: loadout
id: PirateFirstMateClothingOuterCoatGentle
price: 0
equipment:
outerClothing: ClothingOuterCoatGentle

- type: loadout
id: PirateCaptainClothingOuterCoatPirate
price: 0
equipment:
outerClothing: ClothingOuterCoatPirate
5 changes: 5 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: loadout
id: ValetClothingOuterVestValet
price: 0
equipment:
outerClothing: ClothingOuterVestValet
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- BailiffOuterClothing
fallbacks:
- ContractorClothingOuterVestTank

- type: loadoutGroup
id: BailiffHead
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- BrigmedicOuterClothing
fallbacks:
- ContractorClothingOuterVestTank

- type: loadoutGroup
id: BrigmedicHead
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- NfsdOuterClothing
fallbacks:
- ContractorClothingOuterVestTank

- type: loadoutGroup
id: CadetHead
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- ContractorClothingOuterSuitEmergency
- ContractorClothingOuterHardsuitEVA
- ContractorClothingOuterHardsuitBasic
Expand Down Expand Up @@ -341,6 +342,8 @@
- ContractorWetFloorSign
- ContractorClothingOuterCoatExpensive
- ContractorClothingOuterCoatSpaceAsshole
fallbacks:
- ContractorClothingOuterVestTank # Vox-only, default them to have this equipped

- type: loadoutGroup
id: ContractorBelt
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- NfsdOuterClothing
fallbacks:
- ContractorClothingOuterVestTank

- type: loadoutGroup
id: DeputyHead
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- DetectiveNFClothingOuterArmorBasic
- DetectiveNFClothingOuterCoatDetectiveLoadout
- DetectiveNFClothingOuterCoatDetectiveLoadoutGrey
- DetectiveNFClothingOuterCoatTrench
fallbacks:
- ContractorClothingOuterVestTank

- type: loadoutGroup
id: DetectiveNFHead
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- JanitorNFClothingOuterWinterJani
- JanitorNFWetFloorSign
fallbacks:
- ContractorClothingOuterVestTank
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
name: loadout-group-contractor-outerclothing
minLimit: 0
loadouts:
- ContractorClothingOuterVestTank
- MailCarrierClothingOuterWinterCoatMail
- MailCarrierClothingOuterEVASuitMailman
fallbacks:
- ContractorClothingOuterVestTank

- type: loadoutGroup
id: MailCarrierBackpack
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
subgroups:
- PilotOuterClothing
- ContractorOuterClothing
fallbacks:
- ContractorClothingOuterVestTank # Vox-only, default them to have this equipped

- type: loadoutGroup
id: MercenaryShoes
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
- PilotClothingOuterHardsuitPilot
subgroups:
- ContractorOuterClothing
fallbacks:
- ContractorClothingOuterVestTank # Vox-only, default them to have this equipped

- type: loadoutGroup
id: PilotShoes
Expand Down
40 changes: 30 additions & 10 deletions Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,7 @@
fallbacks:
- PirateClothingHeadBandBlack

- type: loadoutGroup
id: PirateFirstMateHead
name: loadout-group-contractor-head
minLimit: 0
loadouts:
- PirateClothingHeadHatPirateTricord
- PirateClothingHeadHatPirateLuffy
fallbacks:
- PirateClothingHeadHatPirateTricord
# Pirate Captain loadouts

- type: loadoutGroup
id: PirateCaptainHead
Expand All @@ -73,7 +65,15 @@
fallbacks:
- PirateClothingHeadHatPirate

# Pirate Captain loadouts
- type: loadoutGroup
id: PirateCaptainOuterClothing
name: loadout-group-contractor-outerclothing
loadouts:
- ContractorClothingOuterVestTank
- PirateCaptainClothingOuterCoatPirate
fallbacks:
- ContractorClothingOuterVestTank
- PirateCaptainClothingOuterCoatPirate

- type: loadoutGroup
id: PirateCaptainPDA
Expand All @@ -86,6 +86,26 @@

# Pirate First Mate loadouts

- type: loadoutGroup
id: PirateFirstMateHead
name: loadout-group-contractor-head
minLimit: 0
loadouts:
- PirateClothingHeadHatPirateTricord
- PirateClothingHeadHatPirateLuffy
fallbacks:
- PirateClothingHeadHatPirateTricord

- type: loadoutGroup
id: PirateFirstMateOuterClothing
name: loadout-group-contractor-outerclothing
loadouts:
- ContractorClothingOuterVestTank
- PirateFirstMateClothingOuterCoatGentle
fallbacks:
- ContractorClothingOuterVestTank
- PirateFirstMateClothingOuterCoatGentle

- type: loadoutGroup
id: PirateFirstMatePDA
name: loadout-group-contractor-id
Expand Down
Loading
Loading