From 5c0c0955bed20b483c96ada05a3c1d74d58fc303 Mon Sep 17 00:00:00 2001 From: NEirotoXiN Date: Sun, 16 Jun 2024 03:09:43 +0300 Subject: [PATCH 1/2] Fix purchase and add loadout --- .../Shipyard/Systems/ShipyardSystem.Consoles.cs | 2 +- .../Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml | 12 +++++++++++- .../_NF/Loadouts/mercenary_loadout_groups.yml | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index 0bc14bd88c7..835f8f5c131 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -130,7 +130,7 @@ private void OnPurchaseMessage(EntityUid uid, ShipyardConsoleComponent component return; } - if (bank.Balance <= vessel.Price) + if (bank.Balance < vessel.Price) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-insufficient-funds", ("cost", vessel.Price))); PlayDenySound(uid, component); diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml index 1ca55cb15e3..70b75fe6b97 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml @@ -16,4 +16,14 @@ - type: startingGear id: MercenaryClothingMaskGasSecurity equipment: - mask: ClothingMaskGasSecurity \ No newline at end of file + mask: ClothingMaskGasSecurity + +- type: loadout + id: MercenaryClothingMaskBreathMedical + equipment: MercenaryClothingMaskBreathMedical + price: 0 + +- type: startingGear + id: MercenaryClothingMaskBreathMedical + equipment: + mask: ClothingMaskBreathMedical \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index 44e8819e3f1..0434c78eaf9 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -616,6 +616,7 @@ - ContractorClothingMaskScaredMime - ContractorClothingMaskSadMime - ContractorClothingMaskClown + - ClothingMaskBreathMedical - type: loadoutGroup id: MercenaryBelt From 2cab272e65f75246229bed74a7e71c4e10d95387 Mon Sep 17 00:00:00 2001 From: NEirotoXiN Date: Sun, 16 Jun 2024 03:35:16 +0300 Subject: [PATCH 2/2] fix prototypes --- Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index 0434c78eaf9..acc54e9dc1b 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -616,7 +616,7 @@ - ContractorClothingMaskScaredMime - ContractorClothingMaskSadMime - ContractorClothingMaskClown - - ClothingMaskBreathMedical + - MercenaryClothingMaskBreathMedical - type: loadoutGroup id: MercenaryBelt