diff --git a/code/controllers/subsystems/initialization/misc_late.dm b/code/controllers/subsystems/initialization/misc_late.dm index 418539145ec..64861c35398 100644 --- a/code/controllers/subsystems/initialization/misc_late.dm +++ b/code/controllers/subsystems/initialization/misc_late.dm @@ -5,6 +5,9 @@ SUBSYSTEM_DEF(misc_late) init_order = SS_INIT_MISC flags = SS_NO_FIRE | SS_NO_DISPLAY + /// this is a list of things that fire when late misc init is called + var/list/late_misc_firers + /datum/controller/subsystem/misc_late/Initialize(timeofday) // Setup the teleport locs. for(var/area/AR as anything in GLOB.the_station_areas) @@ -27,9 +30,9 @@ SUBSYSTEM_DEF(misc_late) populate_code_phrases() // this covers mapped in drone fabs - for(var/atom/thing as anything in SSatoms.late_loaders) + for(var/atom/thing as anything in late_misc_firers) thing.do_late_fire() - LAZYREMOVE(SSatoms.late_loaders, thing) + LAZYREMOVE(late_misc_firers, thing) if (GLOB.config.use_forumuser_api) update_admins_from_api(TRUE) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b9d15bf1f08..84aa0030f2e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -729,7 +729,7 @@ if(SSticker.current_state == GAME_STATE_PLAYING) do_late_fire() return - LAZYADD(SSatoms.late_loaders, src) + LAZYADD(SSmisc_late.late_misc_firers, src) /atom/proc/do_late_fire() return diff --git a/code/modules/effects/maze_generation/maze_generator.dm b/code/modules/effects/maze_generation/maze_generator.dm index df01c8e2162..4552fd1ee51 100644 --- a/code/modules/effects/maze_generation/maze_generator.dm +++ b/code/modules/effects/maze_generation/maze_generator.dm @@ -51,7 +51,7 @@ do { \ run_generator() /obj/effect/mazegen/generator/Destroy() - LAZYREMOVE(SSatoms.late_loaders, src) + LAZYREMOVE(SSmisc_late.late_misc_firers, src) return ..() // "Push" a turf to the working "stack" diff --git a/html/changelogs/geeves-matriarch_fix.yml b/html/changelogs/geeves-matriarch_fix.yml new file mode 100644 index 00000000000..ed25b234a41 --- /dev/null +++ b/html/changelogs/geeves-matriarch_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed the matriarch drone slot not opening correctly." \ No newline at end of file