Merge pull request #7 from Corvax-Frontier/Up090824

Апстрём плюс фиксики
Corvax-Frontier · Aug 9, 2024 · 3a81dcc · 3a81dcc
2 parents 7f1095f + 7fd6e32
commit 3a81dcc
Show file tree

Hide file tree

Showing 234 changed files with 15,039 additions and 18,251 deletions.
diff --git a/Content.Client/_NF/Latejoin/VesselListControl.xaml.cs b/Content.Client/_NF/Latejoin/VesselListControl.xaml.cs
@@ -129,6 +129,9 @@ private void UpdateUi(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobProto
             if (VesselItemList.Any(x => (NetEntity) x.Metadata! == key))
                 continue;
 
+            if (_gameTicker.JobsAvailable[key].Values.Count == 0)
+                continue; // No jobs here, continue.
+
             var jobsAvailable = _gameTicker.JobsAvailable[key].Values.Sum(a => a ?? 0);
             var item = new ItemList.Item(VesselItemList)
             {

diff --git a/Content.Client/_NF/Market/UI/MarketMenu.xaml.cs b/Content.Client/_NF/Market/UI/MarketMenu.xaml.cs
@@ -77,6 +77,7 @@ public void UpdateState(MarketConsoleInterfaceState uiState)
         PurchaseCart.Text = _loc.GetString("market-purchase-cart-button") +
                             (uiState.CartBalance + uiState.TransactionCost);
         SetUiEnabled(uiState.Enabled);
+        PurchaseCart.Disabled = uiState.CartDataList.Count <= 0;
     }
 
     private void Populate(List<MarketData> data, List<MarketData> cartData, float marketModifier, bool enabled = true)

diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -652,7 +652,12 @@ public override void Update(float frameTime)
                     for (var i = 0; i < active.PortionedRecipe.Item2; i++)
                     {
                         SubtractContents(microwave, active.PortionedRecipe.Item1);
-                        Spawn(active.PortionedRecipe.Item1.Result, coords);
+                        // Frontier: ResultCount - support multiple results per recipe
+                        for (var r = 0; r < active.PortionedRecipe.Item1.ResultCount; r++)
+                        {
+                            Spawn(active.PortionedRecipe.Item1.Result, coords);
+                        }
+                        // End Frontier
                     }
                 }
 

diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
@@ -21,6 +21,7 @@
 using Robust.Shared.Prototypes;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Nyanotrasen.Abilities;
+using Content.Shared.CombatMode.Pacification; // Frontier
 
 namespace Content.Server.Abilities.Felinid
 {
@@ -47,6 +48,8 @@ public override void Initialize()
             SubscribeLocalEvent<FelinidComponent, DidUnequipHandEvent>(OnUnequipped);
             SubscribeLocalEvent<HairballComponent, ThrowDoHitEvent>(OnHairballHit);
             SubscribeLocalEvent<HairballComponent, GettingPickedUpAttemptEvent>(OnHairballPickupAttempt);
+
+            SubscribeLocalEvent<HairballComponent, AttemptPacifiedThrowEvent>(OnHairballAttemptPacifiedThrow); // Frontier - Block hairball abuse
         }
 
         private Queue<EntityUid> RemQueue = new();
@@ -190,6 +193,11 @@ private void OnHairballPickupAttempt(EntityUid uid, HairballComponent component,
                 args.Cancel();
             }
         }
+
+        private void OnHairballAttemptPacifiedThrow(Entity<HairballComponent> ent, ref AttemptPacifiedThrowEvent args) // Frontier - Block hairball abuse
+        {
+            args.Cancel("pacified-cannot-throw-hairball");
+        }
     }
 
 }
diff --git a/Content.Server/_NF/GameRule/AdventureRuleComponent.cs b/Content.Server/_NF/GameRule/AdventureRuleComponent.cs
@@ -1,9 +1,17 @@
-using Robust.Shared.Audio;
-
-namespace Content.Server.GameTicking.Rules.Components;
+/*
+ * New Frontiers - This file is licensed under AGPLv3
+ * Copyright (c) 2024 New Frontiers
+ * See AGPLv3.txt for details.
+ */
+namespace Content.Server._NF.GameRule;
 
 [RegisterComponent, Access(typeof(NfAdventureRuleSystem))]
 public sealed partial class AdventureRuleComponent : Component
 {
-
+    public List<EntityUid> NFPlayerMinds = new();
+    public List<EntityUid> CargoDepots = new();
+    public List<EntityUid> MarketStations = new();
+    public List<EntityUid> RequiredPois = new();
+    public List<EntityUid> OptionalPois = new();
+    public List<EntityUid> UniquePois = new();
 }