]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix artifact point extraction going into negatives (#36642)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Thu, 17 Apr 2025 03:14:17 +0000 (23:14 -0400)
committerGitHub <noreply@github.com>
Thu, 17 Apr 2025 03:14:17 +0000 (23:14 -0400)
Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs
Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs

index 2d5aa459fbe3049f5602203c74001347e209e4ba..ee9bcf8ec9a6882d74b9936ad2afd66c5521309f 100644 (file)
@@ -39,7 +39,8 @@ public sealed class ArtifactAnalyzerSystem : SharedArtifactAnalyzerSystem
             sumResearch += research;
         }
 
-        if (sumResearch == 0)
+        // 4-16-25: It's a sad day when a scientist makes negative 5k research
+        if (sumResearch <= 0)
             return;
 
         _research.ModifyServerPoints(server.Value, sumResearch, serverComponent);
index 75f88a41c312fd6029eb60f1caf2aa419674fba0..899e578bcf0d8706237a85f77319f49d3e026a9d 100644 (file)
@@ -163,7 +163,7 @@ public abstract partial class SharedXenoArtifactSystem
         if (ent.Comp.Locked)
             return 0;
 
-        return ent.Comp.ResearchValue - ent.Comp.ConsumedResearchValue;
+        return Math.Max(0, ent.Comp.ResearchValue - ent.Comp.ConsumedResearchValue);
     }
 
     /// <summary>