From 96ec56b8f4dcac02cd92f27893e76bc9b620cc42 Mon Sep 17 00:00:00 2001
From: SkaldetSkaeg <impotekh@gmail.com>
Date: Mon, 13 Jan 2025 18:51:17 +0700
Subject: [PATCH] conflict fix

---
 Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs b/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs
index c73fcee6d55b..571da95579f0 100644
--- a/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs
+++ b/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs
@@ -111,7 +111,7 @@ private void UpdateStage(Entity<CultYoggComponent> entity, ref ChangeCultYoggSta
                         huAp.MarkingSet.Markings[MarkingCategories.Special].Add(new Marking(newMarkingId, colorCount: 1));
                     }
                 }
-                if (huAp.MarkingSet.Markings.TryGetValue(MarkingCategories.Special, out var value))
+                else
                 {
                     // We have species-marking only for the Nians, so this log only leads to unnecessary errors.
                     //Log.Error($"{newMarkingId} marking doesn't exist");