Merge branch 'feat/blood-cult-dlc-1' of https://github.com/Remuchi/Ei…

…nstein-Engines into feat/blood-cult-dlc-1
Simple-Station · Dec 10, 2024 · 19bb64a · 19bb64a
2 parents 44d09f0 + 7fd44e3
commit 19bb64a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesSystem.cs b/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesSystem.cs
@@ -251,7 +251,7 @@ private void ConsumePuddles(EntityUid origin, Entity<BloodRitesAuraComponent> ri
         foreach (var puddle in lookup)
         {
             if (!TryComp(puddle, out SolutionContainerManagerComponent? solutionContainer))
-                return;
+                continue;
             ConsumeBloodFromSolution((puddle, solutionContainer), rites);
         }
 

diff --git a/Content.Server/WhiteDream/BloodCult/Runes/CultRuneBaseSystem.cs b/Content.Server/WhiteDream/BloodCult/Runes/CultRuneBaseSystem.cs
@@ -118,11 +118,10 @@ private void OnDrawRune(Entity<BloodCultistComponent> ent, ref DrawRuneDoAfter a
 
         _audio.PlayPvs(args.EndDrawingSound, args.User, AudioParams.Default.WithMaxDistance(2f));
         var runeEnt = SpawnRune(args.User, runeSelector.Prototype);
-        if (TryComp(runeEnt, out CultRuneBaseComponent? rune) && rune.TriggerRendingMarkers)
-        {
-           if (!_cultRule.TryConsumeNearestMarker(ent))
-               return;
-        }
+        if (TryComp(runeEnt, out CultRuneBaseComponent? rune) 
+            && rune.TriggerRendingMarkers
+            && !_cultRule.TryConsumeNearestMarker(ent))
+            return;
 
         var ev = new AfterRunePlaced(args.User);
         RaiseLocalEvent(runeEnt, ev);