cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Goliath tentacles now detach when the goliath dies (#96681)

Browse Source 
## About The Pull Request

Doesn't make sense for tentacles to keep pulling you towards the goliath
after it dies

## Changelog
🆑
fix: Goliath tentacles now detach when the goliath dies
/🆑
This commit is contained in:
SmArtKar
2026-06-29 18:32:16 +02:00
committed by GitHub
parent 292e260aea
commit 1c70edf11c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
+3 -1
View File
@@ -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