From aa9dbf745610b7b288822dd72dd0da8572d5c072 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 28 Jan 2024 06:00:02 +0100 Subject: [PATCH] [MIRROR] Fix runtime from triggering rush organ via goliath grab (#26255) * Fix runtime from triggering rush organ via goliath grab (#81101) ## About The Pull Request `trigger_organ_action`'s first and only argument is trigger flags to pass to `Trigger` The first argument if signals is the datum sending the signal ![image](https://github.com/tgstation/tgstation/assets/51863163/ebde6e12-f5de-41f9-829e-0727cc8b3072) ## Changelog :cl: Melbert fix: Rush Gland now triggers correctly on being grabbed by a Goliath /:cl: * Fix runtime from triggering rush organ via goliath grab --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/mining/equipment/monster_organs/rush_gland.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm index b3932afdaab..b3dbc683da4 100644 --- a/code/modules/mining/equipment/monster_organs/rush_gland.dm +++ b/code/modules/mining/equipment/monster_organs/rush_gland.dm @@ -23,7 +23,7 @@ /obj/item/organ/internal/monster_core/rush_gland/on_mob_insert(mob/living/carbon/organ_owner) . = ..() - RegisterSignal(organ_owner, COMSIG_GOLIATH_TENTACLED_GRABBED, PROC_REF(trigger_organ_action)) + RegisterSignal(organ_owner, COMSIG_GOLIATH_TENTACLED_GRABBED, PROC_REF(trigger_organ_action_on_sig)) /obj/item/organ/internal/monster_core/rush_gland/on_mob_remove(mob/living/carbon/organ_owner, special) . = ..() @@ -32,6 +32,10 @@ /obj/item/organ/internal/monster_core/rush_gland/on_triggered_internal() owner.apply_status_effect(/datum/status_effect/lobster_rush/extended) +/obj/item/organ/internal/monster_core/rush_gland/proc/trigger_organ_action_on_sig(datum/source) + SIGNAL_HANDLER + INVOKE_ASYNC(src, PROC_REF(trigger_organ_action)) + /** * Status effect: Makes you run really fast and ignore speed penalties for a short duration. * If you run into a wall indoors you will fall over and lose the buff.