From 44d7443077bfdbc9d0255763642401aa4b65ae86 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 16 Nov 2022 00:22:01 +0100 Subject: [PATCH] [MIRROR] [NO GBP] Monster organs were extending the wrong proc following a refactor. [MDB IGNORE] (#17471) * [NO GBP] Monster organs were extending the wrong proc following a refactor. (#71231) ## About The Pull Request During a refactor of the lavaland monster organ PR I split one proc into two and then called the wrong one on all of the children, oops. This led to the Rush Gland experiencing no cooldown when triggering itself at low health, which is unquestionably more useful but not how it is supposed to work. ## Why It's Good For The Game Implanting the organ shouldn't grant you unlimited super speed while at low health, even if you're very likely to run into a wall and crit yourself as a result. ## Changelog :cl: fix: Lobstrosity Rush Glands now correctly apply their action cooldown when they trigger from low health. /:cl: * [NO GBP] Monster organs were extending the wrong proc following a refactor. Co-authored-by: Jacquerel --- code/modules/mining/equipment/monster_organs/brimdust_sac.dm | 2 +- code/modules/mining/equipment/monster_organs/monster_organ.dm | 2 +- .../mining/equipment/monster_organs/regenerative_core.dm | 2 +- code/modules/mining/equipment/monster_organs/rush_gland.dm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm index 76723344832..ae9cfbef130 100644 --- a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm +++ b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm @@ -46,7 +46,7 @@ qdel(src) /// Make a cloud which applies brimdust to everyone nearby -/obj/item/organ/internal/monster_core/brimdust_sac/trigger_organ_action() +/obj/item/organ/internal/monster_core/brimdust_sac/on_triggered_internal() var/turf/origin_turf = get_turf(owner) do_smoke(range = 2, holder = owner, location = origin_turf, smoke_type = /obj/effect/particle_effect/fluid/smoke/bad/brimdust) diff --git a/code/modules/mining/equipment/monster_organs/monster_organ.dm b/code/modules/mining/equipment/monster_organs/monster_organ.dm index 0cdc4cb19d3..8ced22edc23 100644 --- a/code/modules/mining/equipment/monster_organs/monster_organ.dm +++ b/code/modules/mining/equipment/monster_organs/monster_organ.dm @@ -208,4 +208,4 @@ var/obj/item/organ/internal/monster_core/organ = target if (!istype(organ)) return - organ.trigger_organ_action() + organ.on_triggered_internal() diff --git a/code/modules/mining/equipment/monster_organs/regenerative_core.dm b/code/modules/mining/equipment/monster_organs/regenerative_core.dm index 4f89e66ce96..1930337cd2c 100644 --- a/code/modules/mining/equipment/monster_organs/regenerative_core.dm +++ b/code/modules/mining/equipment/monster_organs/regenerative_core.dm @@ -30,7 +30,7 @@ if (owner.health <= owner.crit_threshold) trigger_organ_action() -/obj/item/organ/internal/monster_core/regenerative_core/trigger_organ_action() +/obj/item/organ/internal/monster_core/regenerative_core/on_triggered_internal() owner.revive(full_heal = TRUE, admin_revive = FALSE) qdel(src) diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm index 84b08de0ddf..5bf26343311 100644 --- a/code/modules/mining/equipment/monster_organs/rush_gland.dm +++ b/code/modules/mining/equipment/monster_organs/rush_gland.dm @@ -21,7 +21,7 @@ if (owner.health <= HEALTH_DANGER_ZONE) trigger_organ_action() -/obj/item/organ/internal/monster_core/rush_gland/trigger_organ_action() +/obj/item/organ/internal/monster_core/rush_gland/on_triggered_internal() owner.apply_status_effect(/datum/status_effect/lobster_rush/extended) /**