From 4c937d62ffcd0afd40ddc77b61a381a54828e5c2 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Tue, 22 Oct 2024 05:33:16 -0400 Subject: [PATCH] refactor: Only sort named machine lists at mapload end. (#27081) --- code/controllers/subsystem/non_firing/SSlate_mapping.dm | 4 ++++ code/modules/atmospherics/machinery/airalarm.dm | 4 +++- code/modules/power/apc/apc.dm | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/non_firing/SSlate_mapping.dm b/code/controllers/subsystem/non_firing/SSlate_mapping.dm index ca68dc48e9f..b3e66541577 100644 --- a/code/controllers/subsystem/non_firing/SSlate_mapping.dm +++ b/code/controllers/subsystem/non_firing/SSlate_mapping.dm @@ -12,6 +12,10 @@ SUBSYSTEM_DEF(late_mapping) var/list/obj/effect/spawner/bridge/bridge_spawners = list() /datum/controller/subsystem/late_mapping/Initialize() + // Sort all the air machines we initialized during mapload by name all at once + GLOB.air_alarms = sortAtom(GLOB.air_alarms) + GLOB.apcs = sortAtom(GLOB.apcs) + if(length(maze_generators)) var/watch = start_watch() log_startup_progress("Generating mazes...") diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 1363484743c..4b8b4c2288f 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -209,7 +209,9 @@ set_pixel_offsets_from_dir(24, -24, 24, -24) GLOB.air_alarms += src - GLOB.air_alarms = sortAtom(GLOB.air_alarms) + + if(!mapload) + GLOB.air_alarms = sortAtom(GLOB.air_alarms) wires = new(src) diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm index e1f99ebb895..f818ad845c9 100644 --- a/code/modules/power/apc/apc.dm +++ b/code/modules/power/apc/apc.dm @@ -131,7 +131,6 @@ armor = list(MELEE = 20, BULLET = 20, LASER = 10, ENERGY = 100, BOMB = 30, RAD = 100, FIRE = 90, ACID = 50) ..() GLOB.apcs += src - GLOB.apcs = sortAtom(GLOB.apcs) wires = new(src) @@ -179,6 +178,7 @@ A.powernet.powernet_apc = src if(!mapload) + GLOB.apcs = sortAtom(GLOB.apcs) return electronics_state = APC_ELECTRONICS_SECURED