From f08210b8f54ec99ce50f2fa8bbfc9a158dbddf49 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 6 Apr 2025 15:44:17 -0400
Subject: [PATCH] Fix Various Test Fails (#2186)

# Description

Fixes a few test fails caused by merging PRs that had test fails. Also
fixed a bug with spell popup text. And cleaned up the Mantis blade
summoning test.

https://github.com/user-attachments/assets/3ae44f67-99da-4d16-ade1-5473bf7baad0

# Changelog

:cl:
- tweak: Taught the Psionic Mantis how to summon his blade quietly, and
not do so via screaming like a lunatic.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit 7aebe8a48f7ed1d252ba9859cb5a2d4482cc21e4)
---
 .../Tests/PostMapInitTest.cs                  |  2 +-
 Content.Server/Antag/AntagSelectionSystem.cs  |  2 +-
 Content.Server/Magic/MagicSystem.cs           |  2 +-
 .../BloodCult/Spells/BloodCultSpellsSystem.cs | 11 ++++----
 .../en-US/_Impstation/markings/thaven.ftl     | 19 +++++++++++++
 .../en-US/traits/psychoHistorianPowers.ftl    | 28 +++++++++++++++++++
 .../Prototypes/Psionics/mantisPowers.yml      |  4 +--
 7 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 95c44a8d31..03432f3f23 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -61,7 +61,7 @@ namespace Content.IntegrationTests.Tests
             "Arena", // Maintained by astriloqua.
             "Asterisk", // Maintained by mrs.
             "Glacier", // Maintained by Violet
-            // "TheHive", // De-rotated, no current maintainer.
+            "TheHive", // Maintained by dootythefrooty
             // "Hammurabi", // De-rotated, maintained by Ichai.
             "Lighthouse", // Maintained by Violet
             // "Submarine", // De-rotated, no current maintainer.
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 2308f9b2d0..0b15af276b 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -281,7 +281,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         // It may otherwise process leftover slots if maxRetries have
         // been reached.
 
-        for (var i = ent.Comp.SelectedSessions.Count; i < count; i++)
+        for (var i = ent.Comp.SelectedSessions.Count; i < count; ++i)
         {
             MakeAntag(ent, null, def);
         }
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index c25aada3a0..5997c56e24 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -18,6 +18,6 @@ public sealed class MagicSystem : SharedMagicSystem
 
     private void OnSpellSpoken(ref SpeakSpellEvent args)
     {
-        _chat.TrySendInGameICMessage(args.Performer, Loc.GetString(args.Speech), InGameICChatType.Speak, false);
+        _chat.TrySendInGameICMessage(args.Performer, Loc.GetString(args.Speech), args.ChatType, false);
     }
 }
diff --git a/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs b/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs
index 369afd0f48..971d2ffeb7 100644
--- a/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs
+++ b/Content.Server/WhiteDream/BloodCult/Spells/BloodCultSpellsSystem.cs
@@ -179,8 +179,7 @@ public sealed class BloodCultSpellsSystem : EntitySystem
         if (ev.Handled)
             return;
 
-        if (ev.Speech is not null)
-            _magicSystem.Speak(ev.Performer, ev.Speech, ev.InvokeChatType);
+
 
         foreach (var (slot, protoId) in ev.Prototypes)
         {
@@ -193,11 +192,13 @@ public sealed class BloodCultSpellsSystem : EntitySystem
                 return;
             }
 
-            if (!TryComp(entity, out ClothingComponent? _))
+            if (!TryComp(entity, out ClothingComponent? clothing)
+                || !_inventory.TryUnequip(ev.Performer, slot, clothing: clothing)
+                || !_inventory.TryEquip(ev.Performer, entity, slot, clothing: clothing, force: true))
                 continue;
 
-            _inventory.TryUnequip(ev.Performer, slot);
-            _inventory.TryEquip(ev.Performer, entity, slot, force: true);
+            if (ev.Speech is not null)
+                _magicSystem.Speak(ev.Performer, ev.Speech, ev.InvokeChatType);
         }
 
         ev.Handled = true;
diff --git a/Resources/Locale/en-US/_Impstation/markings/thaven.ftl b/Resources/Locale/en-US/_Impstation/markings/thaven.ftl
index 8b5a69c2db..4d495447e7 100644
--- a/Resources/Locale/en-US/_Impstation/markings/thaven.ftl
+++ b/Resources/Locale/en-US/_Impstation/markings/thaven.ftl
@@ -25,3 +25,22 @@ marking-ThavenLArmTattoo1 = Arm Band (Left)
 marking-ThavenRArmTattoo1-larmtat1 = Arm Band (Right)
 marking-ThavenRArmTattoo1 =  Arm Band (Right)
 
+marking-Gills = Gills
+marking-SharkminnowEyeliner = Sharkminnow Eyeliner
+marking-ThavenBiteMark = Bite Mark
+marking-ThavenBodyStripes = Body Stripes
+marking-ThavenEarsBigFins = Big Fins
+marking-ThavenFishEars = Fish Ears
+marking-ThavenHeadCap = Head Cap
+marking-ThavenHeadScales = Head Scales
+marking-ThavenHeadStripes = Head Stripes
+marking-ThavenLArmScales = Arm Scales (left)
+marking-ThavenLLegScales = Leg Scales (left)
+marking-ThavenRArmScales = Arm Scales (right)
+marking-ThavenRLegScales = Leg Scales (right)
+marking-ThavenSpines = Spines
+marking-ThavenTattooVines = Vines Tattoo
+marking-ThavenTattooWave = Wave Tattoo
+marking-ThavenTiger = Tiger Stripes
+marking-ThavenTigerLArm = Tiger Stripes (left arm)
+marking-ThavenTigerRArm = Tiger Stripes (right arm)
diff --git a/Resources/Locale/en-US/traits/psychoHistorianPowers.ftl b/Resources/Locale/en-US/traits/psychoHistorianPowers.ftl
index 561e624d10..2179d8d18c 100644
--- a/Resources/Locale/en-US/traits/psychoHistorianPowers.ftl
+++ b/Resources/Locale/en-US/traits/psychoHistorianPowers.ftl
@@ -1,17 +1,45 @@
 # All of the descriptions are intentionally omitted.
 trait-name-PsychoHistorianAssayPower = Assay
+trait-description-PsychoHistorianAssayPower = ...
+
 trait-name-PsychoHistorianDispelPower = Dispel
+trait-description-PsychoHistorianDispelPower = ...
+
 trait-name-PsychoHistorianMetapsionicPower = Metapsionic Pulse
+trait-description-PsychoHistorianMetapsionicPower = ...
+
 trait-name-PsychoHistorianPsychognomyPower = Psychognomy
+trait-description-PsychoHistorianPsychognomyPower = ...
+
 trait-name-PsychoHistorianXenoglossyPower = Xenoglossy
+trait-description-PsychoHistorianXenoglossyPower = ...
+
 trait-name-PsychoHistorianTelegnosisPower = Telegnosis
+trait-description-PsychoHistorianTelegnosisPower = ...
+
 trait-name-PsychoHistorianPsionicInvisibilityPower = Psionic Invisibility
+trait-description-PsychoHistorianPsionicInvisibilityPower = ...
 
 trait-name-ElementalistShadeskipPower = Shadeskip
+trait-description-ElementalistShadeskipPower = ...
+
 trait-name-ElementalistAnoigoPower = Anoigo
+trait-description-ElementalistAnoigoPower = ...
+
 trait-name-ElementalistHealingWordPower = Healing Word
+trait-description-ElementalistHealingWordPower = ...
+
 trait-name-ElementalistTelekineticPulsePower = Telekinetic Pulse
+trait-description-ElementalistTelekineticPulsePower = ...
+
 trait-name-ElementalistNoosphericZapPower = Noospheric Zap
+trait-description-ElementalistNoosphericZapPower = ...
+
 trait-name-ElementalistDarkSwapPower = Dark Swap
+trait-description-ElementalistDarkSwapPower = ...
+
 trait-name-ElementalistRevivifyPower = Revivify
+trait-description-ElementalistRevivifyPower = ...
+
 trait-name-ElementalistPyrokineticFlarePower = Pyrokinetic Flare
+trait-description-ElementalistPyrokineticFlarePower = ...
diff --git a/Resources/Prototypes/Psionics/mantisPowers.yml b/Resources/Prototypes/Psionics/mantisPowers.yml
index 257249a516..76e4606b0a 100644
--- a/Resources/Prototypes/Psionics/mantisPowers.yml
+++ b/Resources/Prototypes/Psionics/mantisPowers.yml
@@ -31,8 +31,8 @@
       sprite: WhiteDream/BloodCult/Entities/Items/Weapons/cult_blade.rsi
       state: icon
     event: !type:SummonEquipmentEvent
-      speech: "I CALL ON THE HEART OF QLIPPOTH, OF WOE AND THE END OF ALL THINGS. TO THIS DOOMED PLANE OF MORTAL MEN, I SHALL BRING A SEA OF BLOOD. TO MY HAND, BLACK BLADE"
-      invokeChatType: Speak
+      speech: "thrusts their open hand to the side. A black blade forms from nothingness into their waiting hand. Whispering demonic voices echo around the sword..."
+      invokeChatType: Emote
       prototypes:
         hand1: MantisBlackBlade
   - type: BaseCultSpell