diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index e099ff0b384..ecfa7ea3f96 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -49,7 +49,6 @@
return
summoner = host
host.grant_guardian_actions(src)
- RegisterSignal(host, COMSIG_MOB_DEATH, .proc/on_host_death)
/mob/living/simple_animal/hostile/guardian/med_hud_set_health()
if(summoner)
@@ -66,21 +65,15 @@
else
holder.icon_state = "hudhealthy"
-/**
- * Proc which is called when the guardian's host dies.
- *
- * This will only fire if the guardian was created through a holoparsite injector, or the equivalent.
- */
-/mob/living/simple_animal/hostile/guardian/proc/on_host_death()
- if(summoner.stat == DEAD || (!summoner.check_death_method() && summoner.health <= HEALTH_THRESHOLD_DEAD))
- summoner.remove_guardian_actions() // Remove our summoner's action buttons.
- to_chat(src, "Your summoner has died!")
- visible_message("[src] dies along with its user!")
- ghostize()
- qdel(src)
-
/mob/living/simple_animal/hostile/guardian/Life(seconds, times_fired)
..()
+ if(summoner)
+ if(summoner.stat == DEAD || (!summoner.check_death_method() && summoner.health <= HEALTH_THRESHOLD_DEAD))
+ summoner.remove_guardian_actions()
+ to_chat(src, "Your summoner has died!")
+ visible_message("[src] dies along with its user!")
+ ghostize()
+ qdel(src)
snapback()
if(summoned && !summoner && !admin_spawned)
to_chat(src, "You somehow lack a summoner! As a result, you dispel!")