Skip to content

Commit

Permalink
[MIRROR] Fix runtime from triggering rush organ via goliath grab (#634)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Jan 26, 2024
1 parent 5b336ab commit e728a0c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/modules/mining/equipment/monster_organs/rush_gland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand All @@ -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.
Expand Down

0 comments on commit e728a0c

Please sign in to comment.