Merge remote-tracking branch 'LaryNevesPR/EE-Andromeda' into EECanvas

LaryNevesPR · Jan 6, 2025 · 7aaf1fb · 7aaf1fb
2 parents eaf4589 + cd4a189
commit 7aaf1fb
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/Content.Server/Chapel/SacrificialAltarSystem.cs b/Content.Server/Chapel/SacrificialAltarSystem.cs
@@ -48,7 +48,7 @@ private void OnDoAfter(Entity<SacrificialAltarComponent> ent, ref SacrificeDoAft
         _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(args.Args.User):player} sacrificed {ToPrettyString(target):target} on {ToPrettyString(ent):altar}");
 
         // lower glimmer by a random amount
-        _glimmer.Glimmer -= (int) (ent.Comp.GlimmerReduction * psionic.CurrentAmplification);
+        _glimmer.Glimmer -= (int) ((ent.Comp.GlimmerReduction * psionic.CurrentAmplification) * 2);
 
         if (ent.Comp.RewardPool is not null && _random.Prob(ent.Comp.BaseItemChance * psionic.CurrentDampening))
         {

diff --git a/Content.Shared/Chapel/SacrificialAltarComponent.cs b/Content.Shared/Chapel/SacrificialAltarComponent.cs
@@ -35,7 +35,7 @@ public sealed partial class SacrificialAltarComponent : Component
     ///     Base amount to reduce glimmer by, multiplied by the victim's Amplification stat.
     /// </summary>
     [DataField]
-    public float GlimmerReduction = 25;
+    public float GlimmerReduction = 35;
 
     [DataField]
     public List<ProtoId<WeightedRandomEntityPrototype>>? RewardPool;

diff --git a/Resources/Textures/Logo/logo..png b/Resources/Textures/Logo/logo..png
diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png
diff --git a/Resources/Textures/Logo/splashlogo...png b/Resources/Textures/Logo/splashlogo...png
diff --git a/Resources/Textures/Logo/splashlogo.png b/Resources/Textures/Logo/splashlogo.png