From a0464ce3702dc5aa21f7224c2daff3e7b8ba09af Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Fri, 5 Sep 2025 04:59:34 +0200 Subject: [PATCH] Fixes blood drunk miner's dash and some mecha actions not working (#92772) ## About The Pull Request #92354 missed a few uses of Trigger, so blood drunk was missing the clicker arg and some mecha actions didn't account for the change. ## Changelog :cl: fix: Fixed blood drunk miner's dash and some mecha actions not working /:cl: --- .../simple_animal/hostile/megafauna/blood_drunk_miner.dm | 2 +- code/modules/vehicles/mecha/combat/durand.dm | 4 ++-- code/modules/vehicles/mecha/mecha_actions.dm | 2 +- code/modules/vehicles/mecha/working/ripley.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 4f07a92bec1..dc469a813bf 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -200,7 +200,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget(atom/attacked_target) . = ..() if(. && prob(12)) - INVOKE_ASYNC(dash, TYPE_PROC_REF(/datum/action, Trigger), NONE, target) + INVOKE_ASYNC(dash, TYPE_PROC_REF(/datum/action, Trigger), src, NONE, target) /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom name = "hostile-environment miner" diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm index 48d4127083b..c90ff79e60b 100644 --- a/code/modules/vehicles/mecha/combat/durand.dm +++ b/code/modules/vehicles/mecha/combat/durand.dm @@ -70,7 +70,7 @@ if(defense_mode) var/datum/action/action = LAZYACCESSASSOC(occupant_actions, M, /datum/action/vehicle/sealed/mecha/mech_defense_mode) if(action) - INVOKE_ASYNC(action, TYPE_PROC_REF(/datum/action, Trigger), FALSE) + INVOKE_ASYNC(action, TYPE_PROC_REF(/datum/action, Trigger), null, NONE, FALSE) return ..() ///Relays the signal from the action button to the shield, and creates a new shield if the old one is MIA. @@ -142,7 +142,7 @@ Expects a turf. Returns true if the attack should be blocked, false if not.*/ name = "Toggle an energy shield that blocks all attacks from the faced direction at a heavy power cost." button_icon_state = "mech_defense_mode_off" -/datum/action/vehicle/sealed/mecha/mech_defense_mode/Trigger(trigger_flags, forced_state = FALSE) +/datum/action/vehicle/sealed/mecha/mech_defense_mode/Trigger(mob/clicker, trigger_flags, forced_state = FALSE) if(!..()) return if(!chassis || !(owner in chassis.occupants)) diff --git a/code/modules/vehicles/mecha/mecha_actions.dm b/code/modules/vehicles/mecha/mecha_actions.dm index 47d4bc03336..8cd6918dc8b 100644 --- a/code/modules/vehicles/mecha/mecha_actions.dm +++ b/code/modules/vehicles/mecha/mecha_actions.dm @@ -154,7 +154,7 @@ name = "Toggle overclocking" button_icon_state = "mech_overload_off" -/datum/action/vehicle/sealed/mecha/mech_overclock/Trigger(trigger_flags, forced_state = null) +/datum/action/vehicle/sealed/mecha/mech_overclock/Trigger(mob/clicker, trigger_flags, forced_state = null) if(!..()) return if(!chassis || !(owner in chassis.occupants)) diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm index 5b7595da0ca..76d57acb431 100644 --- a/code/modules/vehicles/mecha/working/ripley.dm +++ b/code/modules/vehicles/mecha/working/ripley.dm @@ -183,7 +183,7 @@ var/obj/vehicle/sealed/mecha/ripley/paddy/secmech = chassis button_icon_state = "mech_siren_[secmech?.siren ? "on" : "off"]" -/datum/action/vehicle/sealed/mecha/siren/Trigger(trigger_flags, forced_state = FALSE) +/datum/action/vehicle/sealed/mecha/siren/Trigger(mob/clicker, trigger_flags, forced_state = FALSE) if(!..()) return var/obj/vehicle/sealed/mecha/ripley/paddy/secmech = chassis