From 87752f100fc69af36db1ff220ec9e7044bd3fae8 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Wed, 22 Aug 2018 15:50:27 -0700 Subject: [PATCH] Remove created_atoms tracking from InitializeAtoms --- code/controllers/subsystem/atoms.dm | 9 +-------- code/game/atoms.dm | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 464991e0cf4..ebd8d3801f2 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -11,7 +11,6 @@ SUBSYSTEM_DEF(atoms) var/old_initialized var/list/late_loaders - var/list/created_atoms var/list/BadInitializeCalls = list() @@ -33,13 +32,11 @@ SUBSYSTEM_DEF(atoms) var/count var/list/mapload_arg = list(TRUE) if(atoms) - created_atoms = list() count = atoms.len for(var/I in atoms) var/atom/A = I if(!(A.flags_1 & INITIALIZED_1)) - if(InitAtom(I, mapload_arg)) - atoms -= I + InitAtom(I, mapload_arg) CHECK_TICK else count = 0 @@ -61,10 +58,6 @@ SUBSYSTEM_DEF(atoms) testing("Late initialized [late_loaders.len] atoms") late_loaders.Cut() - if(atoms) - . = created_atoms + atoms - created_atoms = null - /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments) var/the_type = A.type if(QDELING(A)) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f34c2e01218..d801b4d1750 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -45,10 +45,6 @@ //we were deleted return - var/list/created = SSatoms.created_atoms - if(created) - created += src - //Called after New if the map is being loaded. mapload = TRUE //Called from base of New if the map is not being loaded. mapload = FALSE //This base must be called or derivatives must set initialized to TRUE