From 399dff349377d953ee068c31719cc86eef98de3e Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:47:22 -0400 Subject: [PATCH] [MIRROR] Fix actionspeed modifiers with IDs being broken [MDB IGNORE] (#2882) * Fix actionspeed modifiers with IDs being broken (#83758) ## About The Pull Request #78124 added an init arg to these which 99% of actionspeed modifiers don't pass, so it's passed as null, so it sets id = null, so any preset ids get nulled out, meaning actionspeed modifiers intended on overriding each other don't. ## Changelog :cl: Melbert fix: Fix some modifiers to do after speed (sanity, midas gun) stacking when they shouldn't /:cl: * Fix actionspeed modifiers with IDs being broken --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: NovaBot13 --- code/modules/actionspeed/_actionspeed_modifier.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/actionspeed/_actionspeed_modifier.dm b/code/modules/actionspeed/_actionspeed_modifier.dm index 761bfc3ff74..36b9b9c860d 100644 --- a/code/modules/actionspeed/_actionspeed_modifier.dm +++ b/code/modules/actionspeed/_actionspeed_modifier.dm @@ -40,7 +40,8 @@ can next move /datum/actionspeed_modifier/New(init_id) . = ..() - id = init_id + if(init_id) + id = init_id if(!id) id = "[type]" //We turn the path into a string.