From 3ca422f3125307c640d9f5ce453bd5521a3b3d68 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 17 Sep 2024 14:21:54 -0400 Subject: [PATCH 1/7] Move tank harness to outer clothing --- .../_NF/Loadouts/Jobs/Contractor/outer.yml | 9 +++++ .../_NF/Loadouts/Jobs/Pirates/outer.yml | 11 +++++ .../_NF/Loadouts/Jobs/Valet/outer.yml | 5 +++ .../_NF/Loadouts/bailiff_loadout_groups.yml | 3 ++ .../_NF/Loadouts/brigmedic_loadout_groups.yml | 3 ++ .../_NF/Loadouts/cadet_loadout_groups.yml | 3 ++ .../Loadouts/contractor_loadout_groups.yml | 3 ++ .../_NF/Loadouts/deputy_loadout_groups.yml | 3 ++ .../Loadouts/detectivenf_loadout_groups.yml | 3 ++ .../_NF/Loadouts/janitor_loadout_groups.yml | 3 ++ .../Loadouts/mail_carrier_loadout_groups.yml | 3 ++ .../_NF/Loadouts/mercenary_loadout_groups.yml | 2 + .../_NF/Loadouts/pilot_loadout_groups.yml | 2 + .../_NF/Loadouts/pirates_loadout_groups.yml | 40 ++++++++++++++----- .../Prototypes/_NF/Loadouts/role_loadouts.yml | 29 +++----------- .../_NF/Loadouts/security_guard_groups.yml | 2 + .../senior_officer_loadout_groups.yml | 3 ++ .../_NF/Loadouts/sheriff_loadout_groups.yml | 3 ++ .../Loadouts/stationrep_loadout_groups.yml | 3 ++ .../_NF/Loadouts/valet_loadout_groups.yml | 10 +++++ .../_NF/Roles/Jobs/Pirates/pirate_captain.yml | 1 - .../Roles/Jobs/Pirates/pirate_first_mate.yml | 1 - 22 files changed, 110 insertions(+), 35 deletions(-) create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml index dd220df05e9..26b1deaadfa 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 + effects: + - !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..ff5db0b30cf --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml @@ -0,0 +1,11 @@ +- type: loadout + id: PirateFirstMateClothingOuterCoatGentle + price: 0 + equipment: + jumpsuit: ClothingOuterCoatGentle + +- type: loadout + id: PirateCaptainClothingOuterCoatPirate + price: 0 + equipment: + jumpsuit: 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..01bd75c670b --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml @@ -0,0 +1,5 @@ +- type: loadout + id: ValetValetClothingOuterVestValet + price: 0 + equipment: + jumpsuit: ValetClothingOuterVestValet 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 9141dda7592..4dcc9ccb8ae 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 38142051b72..620eba57694 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 b9f2c32dfa3..9d791374980 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 09c026055cd..8af4a25a2f1 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 @@ -26,7 +25,6 @@ - type: roleLoadout id: JobMercenary groups: - - GroupTankHarness - MercenaryHead - ContractorNeck - MercenaryJumpsuit @@ -50,7 +48,6 @@ - type: roleLoadout id: JobPilot groups: - - GroupTankHarness - PilotHead - PilotNeck - PilotJumpsuit @@ -74,10 +71,10 @@ - type: roleLoadout id: JobValet groups: - - GroupTankHarness - ContractorNeck - ValetJumpsuit - ContractorBackpack + - ValetOuterClothing - ContractorShoes - ContractorFace - ContractorGlasses @@ -92,7 +89,6 @@ - type: roleLoadout id: JobMailCarrier groups: - - GroupTankHarness - ContractorNeck - MailCarrierJumpsuit - ContractorGloves @@ -110,7 +106,6 @@ - type: roleLoadout id: JobStationTrafficController groups: - - GroupTankHarness - StcHead - ContractorNeck - StcJumpsuit @@ -130,7 +125,6 @@ - type: roleLoadout id: JobStationRepresentative groups: - - GroupTankHarness - StationRepHead - StationRepNeck - StationRepJumpsuit @@ -150,7 +144,6 @@ - type: roleLoadout id: JobSecurityGuard groups: - - GroupTankHarness - SecurityGuardHead - SecurityGuardJumpsuit - SecurityGuardGloves @@ -171,7 +164,6 @@ - type: roleLoadout id: JobCadet groups: - - GroupTankHarness - CadetHead - CadetJumpsuit - NfsdGlovesBrown @@ -191,7 +183,6 @@ - type: roleLoadout id: JobDeputy groups: - - GroupTankHarness - DeputyHead - DeputyJumpsuit - NfsdGlovesBrown @@ -211,7 +202,6 @@ - type: roleLoadout id: JobBrigmedic groups: - - GroupTankHarness - BrigmedicHead - BrigmedicNeck - BrigmedicJumpsuit @@ -232,7 +222,6 @@ - type: roleLoadout id: JobDetectiveNF groups: - - GroupTankHarness - DetectiveNFHead - DetectiveNFJumpsuit - DetectiveNFGloves @@ -252,12 +241,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 @@ -272,7 +260,6 @@ # - type: roleLoadout # Fix when this is actully used # id: JobPrisonGuard # groups: - # - GroupTankHarness # - PrisonGuardHead # - PrisonGuardJumpsuit # - NfsdGlovesBrown @@ -292,7 +279,6 @@ - type: roleLoadout id: JobBailiff groups: - - GroupTankHarness - BailiffHead - BailiffJumpsuit - NfsdGlovesCream @@ -312,7 +298,6 @@ - type: roleLoadout id: JobSeniorOfficer groups: - - GroupTankHarness - SeniorOfficerHead - SeniorOfficerJumpsuit - NfsdGlovesCream @@ -332,7 +317,6 @@ - type: roleLoadout id: JobSheriff groups: - - GroupTankHarness - SheriffHead - SheriffNeck - SheriffJumpsuit @@ -354,13 +338,12 @@ - type: roleLoadout id: JobPirate groups: - - GroupTankHarness - PirateHead # - PirateNeck - PirateJumpsuit # - PirateGloves - ContractorBackpack -# - PirateOuterClothing + - GroupTankHarness # No outer clothing, this left for vox - PirateShoes - PirateFace - PiratePDA @@ -375,7 +358,7 @@ - PirateJumpsuit # - PirateGloves - ContractorBackpack -# - PirateOuterClothing + - PirateFirstMateOuterClothing - PirateShoes - PirateFace - PirateFirstMatePDA @@ -390,6 +373,7 @@ - PirateJumpsuit # - PirateGloves - ContractorBackpack + - PirateCaptainOuterClothing # - PirateOuterClothing - PirateShoes - PirateFace @@ -401,13 +385,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 3ccf7b02fea..d97e4bb10a7 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 755816a7ada..ade9efad998 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 be8a3bda106..34e8d18710b 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 From 556779c9603563edc793ec9ac90b56c2bf284491 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 17 Sep 2024 14:51:13 -0400 Subject: [PATCH 2/7] Valet outer clothing fixes --- .../Nyanotrasen/Roles/Jobs/Civilian/valet.yml | 14 +++++--------- .../Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml index e028a69fb6c..2e7412b0f5b 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml @@ -25,19 +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 - # innerClothingSkirt: ClothingUniformJumpskirtValet - # satchel: ClothingBackpackSatchelFilled - # duffelbag: ClothingBackpackDuffelFilled - # messenger: ClothingBackpackMessengerFilled # Frontier - storage: # Frontier - back: # Frontier - - ShipVoucherFrontierValet # Frontier + storage: + back: + - ShipVoucherFrontierValet +# End Frontier diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml index 01bd75c670b..603dce6b6d7 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml @@ -1,5 +1,5 @@ - type: loadout - id: ValetValetClothingOuterVestValet + id: ValetClothingOuterVestValet price: 0 equipment: jumpsuit: ValetClothingOuterVestValet From dc5e07a2ef2af5f1f9f9cc4cedcb3f4e5f90796c Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 17 Sep 2024 15:44:18 -0400 Subject: [PATCH 3/7] Fix valet outer clothing --- Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml index 603dce6b6d7..c6207fbd4e7 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml @@ -2,4 +2,4 @@ id: ValetClothingOuterVestValet price: 0 equipment: - jumpsuit: ValetClothingOuterVestValet + jumpsuit: ClothingOuterVestValet From 23d5d904ab4196fa8672e9f9c6ab7c64fe91360c Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 17 Sep 2024 15:50:00 -0400 Subject: [PATCH 4/7] outerclothing, not jumpsuit --- Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml index c6207fbd4e7..60c343cfb57 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml @@ -2,4 +2,4 @@ id: ValetClothingOuterVestValet price: 0 equipment: - jumpsuit: ClothingOuterVestValet + outerClothing: ClothingOuterVestValet From bb981d9a048e26337c2cc9d5a2b94148d77702be Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 17 Sep 2024 15:53:55 -0400 Subject: [PATCH 5/7] Fix pirate outer clothing --- Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml index ff5db0b30cf..b0c08b281bb 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml @@ -2,10 +2,10 @@ id: PirateFirstMateClothingOuterCoatGentle price: 0 equipment: - jumpsuit: ClothingOuterCoatGentle + outerClothing: ClothingOuterCoatGentle - type: loadout id: PirateCaptainClothingOuterCoatPirate price: 0 equipment: - jumpsuit: ClothingOuterCoatPirate + outerClothing: ClothingOuterCoatPirate From d5725fe6a1c3bad66ab7e814f5ec573a095d4475 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 17 Sep 2024 15:55:16 -0400 Subject: [PATCH 6/7] tank: hideEffects, not effects --- Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml index 26b1deaadfa..287f64895a0 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml @@ -1,7 +1,7 @@ - type: loadout id: ContractorClothingOuterVestTank price: 0 - effects: + hideEffects: - !type:GroupLoadoutEffect proto: EffectSpeciesVox equipment: From a8857c2f84fcab2c9f20e72cd2c5342243630586 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Thu, 19 Sep 2024 15:53:22 -0400 Subject: [PATCH 7/7] Fix mercenary loadouts: remove tank harness --- Resources/Prototypes/_NF/Loadouts/role_loadouts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml index 317f7b6bc23..52956441ca3 100644 --- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml @@ -50,7 +50,6 @@ - type: roleLoadout id: JobMercenary groups: - - GroupTankHarness - MercenaryHead - ContractorNeck - MercenaryJumpsuit