From 6c67ba12efd4833f3a4c48ea586d2f72c4135425 Mon Sep 17 00:00:00 2001
From: Migratingcocofruit
 <69551563+Migratingcocofruit@users.noreply.github.com>
Date: Fri, 18 Apr 2025 23:50:45 +0300
Subject: [PATCH] Fix holopara action buttons remaining if your holopara gets
 gibbed (#29011)

* Fix incorporeal mobs getting sucked into the singularity

* Correctly removes the guardian UI from summoner on death
---
 code/game/gamemodes/miniantags/guardian/guardian.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index 778aee87126..72b73aebee1 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -137,6 +137,7 @@
 		return FALSE
 	to_chat(summoner, "<span class='danger'>Your [name] died somehow!</span>")
 	UnregisterSignal(summoner, COMSIG_LIVING_HEALTH_UPDATE)
+	summoner.remove_guardian_actions()
 	summoner.death()
 
 
@@ -182,8 +183,10 @@
 
 /mob/living/simple_animal/hostile/guardian/gib()
 	if(summoner)
+		summoner.remove_guardian_actions()
 		to_chat(summoner, "<span class='danger'>Your [src] was blown up!</span>")
 		summoner.Weaken(20 SECONDS)// your fermillier has died! ROLL FOR CON LOSS!
+	UnregisterSignal(summoner, COMSIG_LIVING_HEALTH_UPDATE)
 	ghostize()
 	qdel(src)