From 08b8714dc9318095f1ab710f1bcddc421a1ac8d6 Mon Sep 17 00:00:00 2001
From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:19:20 -0400
Subject: [PATCH] Fixes mindflayers sometimes being spammed with messages when
 pacified (#30686)

* fixes the message popping up when using action buttons

* Secret second bug that the first bug uncovered, fixes no messages at all
---
 code/datums/actions/spell_action.dm                  | 2 +-
 code/modules/antagonists/mind_flayer/flayer_power.dm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/datums/actions/spell_action.dm b/code/datums/actions/spell_action.dm
index 09be20622c8..d5b28d831b5 100644
--- a/code/datums/actions/spell_action.dm
+++ b/code/datums/actions/spell_action.dm
@@ -44,7 +44,7 @@
 	var/datum/spell/spell = target
 
 	if(owner)
-		return spell.can_cast(owner, show_message)
+		return spell.can_cast(owner, TRUE, show_message)
 	return FALSE
 
 /datum/action/spell_action/apply_unavailable_effect(atom/movable/screen/movable/action_button/button)
diff --git a/code/modules/antagonists/mind_flayer/flayer_power.dm b/code/modules/antagonists/mind_flayer/flayer_power.dm
index 481c3d0a78a..ab9bb75d1c4 100644
--- a/code/modules/antagonists/mind_flayer/flayer_power.dm
+++ b/code/modules/antagonists/mind_flayer/flayer_power.dm
@@ -60,7 +60,8 @@
 		return FALSE
 
 	if(checks_nullification && HAS_TRAIT(user, TRAIT_MINDFLAYER_NULLIFIED))
-		flayer_datum.send_swarm_message("We do not have the energy to manifest that currently...")
+		if(show_message)
+			flayer_datum.send_swarm_message("We do not have the energy to manifest that currently...")
 		return FALSE
 	return TRUE