From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Thu, 17 Apr 2025 03:14:17 +0000 (-0400) Subject: Fix artifact point extraction going into negatives (#36642) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=cc7df12996a8db2a85240d02422fe2a491b277ad;p=space-station-14.git Fix artifact point extraction going into negatives (#36642) --- diff --git a/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs index 2d5aa459fb..ee9bcf8ec9 100644 --- a/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs @@ -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); diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs index 75f88a41c3..899e578bcf 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs @@ -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); } ///