Merge pull request #312 from NEirotoXiN00/FixPurchaseShuttle

Fix purchase sluttle and add loadout mercenary
Corvax-Frontier · Jun 16, 2024 · 7f69084 · 7f69084
2 parents ddd3449 + 2cab272
commit 7f69084
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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
diff --git 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
+  - MercenaryClothingMaskBreathMedical
 
 - type: loadoutGroup
   id: MercenaryBelt