diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml index 1921df321c1..34604270679 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml index dd220df05e9..287f64895a0 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml @@ -1,3 +1,12 @@ +- type: loadout + id: ContractorClothingOuterVestTank + price: 0 + hideEffects: + - !type:GroupLoadoutEffect + proto: EffectSpeciesVox + equipment: + outerClothing: ClothingOuterVestTank + - type: loadout id: ContractorClothingOuterSuitEmergency price: 800 diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml new file mode 100644 index 00000000000..b0c08b281bb --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml @@ -0,0 +1,11 @@ +- type: loadout + id: PirateFirstMateClothingOuterCoatGentle + price: 0 + equipment: + outerClothing: ClothingOuterCoatGentle + +- type: loadout + id: PirateCaptainClothingOuterCoatPirate + price: 0 + equipment: + outerClothing: ClothingOuterCoatPirate diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml new file mode 100644 index 00000000000..60c343cfb57 --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml @@ -0,0 +1,5 @@ +- type: loadout + id: ValetClothingOuterVestValet + price: 0 + equipment: + outerClothing: ClothingOuterVestValet diff --git a/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml index 8c563560113..69653163f3b 100644 --- a/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml @@ -13,7 +13,10 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - BailiffOuterClothing + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: BailiffHead diff --git a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml index 536be22faac..96255a439e6 100644 --- a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml @@ -13,7 +13,10 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - BrigmedicOuterClothing + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: BrigmedicHead diff --git a/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml index e480d03d595..7d96837b166 100644 --- a/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml @@ -13,7 +13,10 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - NfsdOuterClothing + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: CadetHead diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index 6c7b15c5ace..d5826b14f04 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -257,6 +257,7 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - ContractorClothingOuterSuitEmergency - ContractorClothingOuterHardsuitEVA - ContractorClothingOuterHardsuitBasic @@ -341,6 +342,8 @@ - ContractorWetFloorSign - ContractorClothingOuterCoatExpensive - ContractorClothingOuterCoatSpaceAsshole + fallbacks: + - ContractorClothingOuterVestTank # Vox-only, default them to have this equipped - type: loadoutGroup id: ContractorBelt diff --git a/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml index 570e7bab3e7..01297ac3cbf 100644 --- a/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml @@ -13,7 +13,10 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - NfsdOuterClothing + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: DeputyHead diff --git a/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml index dd26cbe9ae6..f2652f5aeda 100644 --- a/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml @@ -13,10 +13,13 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - DetectiveNFClothingOuterArmorBasic - DetectiveNFClothingOuterCoatDetectiveLoadout - DetectiveNFClothingOuterCoatDetectiveLoadoutGrey - DetectiveNFClothingOuterCoatTrench + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: DetectiveNFHead diff --git a/Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml index deabb03a9ec..450e05e44dc 100644 --- a/Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml @@ -32,5 +32,8 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - JanitorNFClothingOuterWinterJani - JanitorNFWetFloorSign + fallbacks: + - ContractorClothingOuterVestTank diff --git a/Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml index 93c8bd8905b..df6abf4c3bc 100644 --- a/Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml @@ -14,8 +14,11 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - MailCarrierClothingOuterWinterCoatMail - MailCarrierClothingOuterEVASuitMailman + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: MailCarrierBackpack diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index 03e823bf99a..a6092af252d 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -50,6 +50,8 @@ subgroups: - PilotOuterClothing - ContractorOuterClothing + fallbacks: + - ContractorClothingOuterVestTank # Vox-only, default them to have this equipped - type: loadoutGroup id: MercenaryShoes diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml index cfb94de4c0c..74b1ba67f37 100644 --- a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml @@ -34,6 +34,8 @@ - PilotClothingOuterHardsuitPilot subgroups: - ContractorOuterClothing + fallbacks: + - ContractorClothingOuterVestTank # Vox-only, default them to have this equipped - type: loadoutGroup id: PilotShoes diff --git a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml index a43fd4c11df..c1c189a69a3 100644 --- a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml index 6cf626b25d2..52956441ca3 100644 --- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml @@ -2,7 +2,6 @@ - type: roleLoadout id: JobContractor groups: - - GroupTankHarness - ContractorHead - ContractorNeck - ContractorJumpsuit @@ -27,7 +26,6 @@ - type: roleLoadout id: JobPilot groups: - - GroupTankHarness - PilotHead - PilotNeck - PilotJumpsuit @@ -52,7 +50,6 @@ - type: roleLoadout id: JobMercenary groups: - - GroupTankHarness - MercenaryHead - ContractorNeck - MercenaryJumpsuit @@ -77,10 +74,10 @@ - type: roleLoadout id: JobValet groups: - - GroupTankHarness - ContractorNeck - ValetJumpsuit - ContractorBackpack + - ValetOuterClothing - ContractorShoes - ContractorFace - ContractorGlasses @@ -96,7 +93,6 @@ - type: roleLoadout id: JobMailCarrier groups: - - GroupTankHarness - ContractorNeck - MailCarrierJumpsuit - ContractorGloves @@ -115,7 +111,6 @@ - type: roleLoadout id: JobStationTrafficController groups: - - GroupTankHarness - StcHead - ContractorNeck - StcJumpsuit @@ -136,7 +131,6 @@ - type: roleLoadout id: JobStationRepresentative groups: - - GroupTankHarness - StationRepHead - StationRepNeck - StationRepJumpsuit @@ -157,7 +151,6 @@ - type: roleLoadout id: JobSecurityGuard groups: - - GroupTankHarness - SecurityGuardHead - SecurityGuardJumpsuit - SecurityGuardGloves @@ -179,7 +172,6 @@ - type: roleLoadout id: JobCadet groups: - - GroupTankHarness - CadetHead - CadetJumpsuit - NfsdGlovesBrown @@ -200,7 +192,6 @@ - type: roleLoadout id: JobDeputy groups: - - GroupTankHarness - DeputyHead - DeputyJumpsuit - NfsdGlovesBrown @@ -221,7 +212,6 @@ - type: roleLoadout id: JobBrigmedic groups: - - GroupTankHarness - BrigmedicHead - BrigmedicNeck - BrigmedicJumpsuit @@ -243,7 +233,6 @@ - type: roleLoadout id: JobDetectiveNF groups: - - GroupTankHarness - DetectiveNFHead - DetectiveNFJumpsuit - DetectiveNFGloves @@ -264,12 +253,11 @@ - type: roleLoadout id: JobPublicAffairsLiaison groups: - - GroupTankHarness - ContractorHead - PalJumpsuit - PalGloves - NfsdBackpackBrown - # no outer clothing + - GroupTankHarness # No outer clothing, this left for Vox - NfsdShoesBrown - ContractorFace - NfsdGlasses @@ -285,7 +273,6 @@ # - type: roleLoadout # Fix when this is actully used # id: JobPrisonGuard # groups: - # - GroupTankHarness # - PrisonGuardHead # - PrisonGuardJumpsuit # - NfsdGlovesBrown @@ -306,7 +293,6 @@ - type: roleLoadout id: JobBailiff groups: - - GroupTankHarness - BailiffHead - BailiffJumpsuit - NfsdGlovesCream @@ -327,7 +313,6 @@ - type: roleLoadout id: JobSeniorOfficer groups: - - GroupTankHarness - SeniorOfficerHead - SeniorOfficerJumpsuit - NfsdGlovesCream @@ -348,7 +333,6 @@ - type: roleLoadout id: JobSheriff groups: - - GroupTankHarness - SheriffHead - SheriffNeck - SheriffJumpsuit @@ -371,13 +355,12 @@ - type: roleLoadout id: JobPirate groups: - - GroupTankHarness - PirateHead # - PirateNeck - PirateJumpsuit # - PirateGloves - ContractorBackpack -# - PirateOuterClothing + - GroupTankHarness # No outer clothing, this left for vox - PirateShoes - PirateFace - PiratePDA @@ -386,13 +369,12 @@ - type: roleLoadout id: JobPirateFirstMate groups: - - GroupTankHarness - PirateFirstMateHead # - PirateNeck - PirateJumpsuit # - PirateGloves - ContractorBackpack -# - PirateOuterClothing + - PirateFirstMateOuterClothing - PirateShoes - PirateFace - PirateFirstMatePDA @@ -401,12 +383,12 @@ - type: roleLoadout id: JobPirateCaptain groups: - - GroupTankHarness - PirateCaptainHead # - PirateNeck - PirateJumpsuit # - PirateGloves - ContractorBackpack + - PirateCaptainOuterClothing # - PirateOuterClothing - PirateShoes - PirateFace @@ -418,13 +400,12 @@ - type: roleLoadout id: JobPrisoner groups: - - GroupTankHarness # - PrisonerHead # - PrisonerNeck - PrisonerJumpsuit # - PrisonerGloves # - PrisonerBackpack -# - PrisonerOuterClothing + - GroupTankHarness # No outer clothing, this left for Vox. # - PrisonerShoes - PrisonerFace - PrisonerPDA diff --git a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml index 1b1afceca84..d831fc28083 100644 --- a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml @@ -41,9 +41,11 @@ id: SecurityGuardOuterClothing name: loadout-group-contractor-outerclothing loadouts: + - ContractorClothingOuterVestTank - ArmorVest - ArmorVestSlim fallbacks: + - ContractorClothingOuterVestTank - ArmorVest - type: loadoutGroup diff --git a/Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml index d799a802729..88d27c85cc9 100644 --- a/Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml @@ -13,7 +13,10 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - SeniorOfficerOuterClothing + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: SeniorOfficerHead diff --git a/Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml index 8c2d847f89c..c3eb6bf9e3a 100644 --- a/Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml @@ -13,7 +13,10 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - SheriffOuterClothing + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: SheriffHead diff --git a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml index 1f8ee67d133..0f5c2559346 100644 --- a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml @@ -14,10 +14,13 @@ name: loadout-group-contractor-outerclothing minLimit: 0 loadouts: + - ContractorClothingOuterVestTank - StationRepClothingOuterArmorSrCarapace - StationRepClothingOuterJacketSr - ContractorClothingOuterCoatExpensive #We let them drip out a little if they want - ContractorClothingOuterCoatSpaceAsshole + fallbacks: + - ContractorClothingOuterVestTank - type: loadoutGroup id: StationRepBackpack diff --git a/Resources/Prototypes/_NF/Loadouts/valet_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/valet_loadout_groups.yml index 11ed55bc07a..2410c6122d5 100644 --- a/Resources/Prototypes/_NF/Loadouts/valet_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/valet_loadout_groups.yml @@ -7,3 +7,13 @@ fallbacks: - ValetClothingUniformJumpsuitValet - ValetClothingUniformJumpskirtValet + +- type: loadoutGroup + id: ValetOuterClothing + name: loadout-group-contractor-outerclothing + loadouts: + - ContractorClothingOuterVestTank + - ValetClothingOuterVestValet + fallbacks: + - ContractorClothingOuterVestTank + - ValetClothingOuterVestValet diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml index ba6b7744d35..4d3edd1f81a 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml @@ -38,7 +38,6 @@ belt: ClothingBeltUtility pocket1: BasePirateUplinkRadioPirateCaptain pocket2: EnergyCutlass - outerClothing: ClothingOuterCoatPirate storage: back: - AppraisalTool diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml index 2f720064985..6139ef57c31 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml @@ -38,4 +38,3 @@ belt: ClothingBeltUtility pocket1: BasePirateUplinkPirateCrew pocket2: AppraisalTool - outerClothing: ClothingOuterCoatGentle