Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Fix purchase sluttle and add loadout mercenary #312

Merged
merged 2 commits into from
Jun 16, 2024
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
2 changes: 1 addition & 1 deletion Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 11 additions & 1 deletion Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,14 @@
- type: startingGear
id: MercenaryClothingMaskGasSecurity
equipment:
mask: ClothingMaskGasSecurity
mask: ClothingMaskGasSecurity

- type: loadout
id: MercenaryClothingMaskBreathMedical
equipment: MercenaryClothingMaskBreathMedical
price: 0

- type: startingGear
id: MercenaryClothingMaskBreathMedical
equipment:
mask: ClothingMaskBreathMedical
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,7 @@
- ContractorClothingMaskScaredMime
- ContractorClothingMaskSadMime
- ContractorClothingMaskClown
- MercenaryClothingMaskBreathMedical

- type: loadoutGroup
id: MercenaryBelt
Expand Down
Loading