From 1c70edf11ca2e347902dd2fa3c30aa42892b16d8 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Mon, 29 Jun 2026 18:32:16 +0200 Subject: [PATCH] Goliath tentacles now detach when the goliath dies (#96681) ## About The Pull Request Doesn't make sense for tentacles to keep pulling you towards the goliath after it dies ## Changelog :cl: fix: Goliath tentacles now detach when the goliath dies /:cl: --- code/modules/mob/living/basic/lavaland/goliath/tentacle.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm index b5af54e4da0..219c193b996 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm @@ -171,6 +171,8 @@ RegisterSignal(beam_effect.visuals, COMSIG_CLICK, PROC_REF(on_beam_click)) RegisterSignals(user, list(SIGNAL_ADDTRAIT(TRAIT_TENTACLE_IMMUNE), COMSIG_BRIMDUST_EXPLOSION), PROC_REF(release)) RegisterSignals(tentacle, list(COMSIG_QDELETING, COMSIG_GOLIATH_TENTACLE_RETRACTING), PROC_REF(on_tentacle_left)) + if (tentacle.owner) + RegisterSignal(tentacle.owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_tentacle_left)) RegisterSignal(leash, COMSIG_QDELETING, PROC_REF(release)) /obj/item/restraints/legcuffs/goliath_tentacle/proc/on_beam_click(atom/source, atom/location, control, params, mob/user) @@ -229,7 +231,7 @@ beam_effect = user.Beam(tentacle.owner, "goliath_tentacle", beam_type = /obj/effect/ebeam/goliath, emissive = FALSE) RegisterSignal(beam_effect.visuals, COMSIG_CLICK, PROC_REF(on_beam_click)) RegisterSignals(user, list(SIGNAL_ADDTRAIT(TRAIT_TENTACLE_IMMUNE), COMSIG_BRIMDUST_EXPLOSION), PROC_REF(release)) - RegisterSignals(tentacle.owner, COMSIG_QDELETING, PROC_REF(on_tentacle_left)) + RegisterSignals(tentacle.owner, list(COMSIG_QDELETING, COMSIG_MOB_STATCHANGE), PROC_REF(on_tentacle_left)) RegisterSignal(leash, COMSIG_QDELETING, PROC_REF(release)) tentacle.retract() tentacle = null