Skip to content

Commit

Permalink
[MIRROR] Fix actionspeed modifiers with IDs being broken [MDB IGNORE] (
Browse files Browse the repository at this point in the history
…#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 <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Jun 7, 2024
1 parent 7acf9e9 commit 399dff3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/actionspeed/_actionspeed_modifier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 399dff3

Please sign in to comment.