diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 6a2e81e125c..abaf835542e 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -1,6 +1,6 @@ var/datum/subsystem/atoms/SSatoms -#define INITIALIZATION_INSSOBJ 0 //New should not call Initialize +#define INITIALIZATION_INSSATOMS 0 //New should not call Initialize #define INITIALIZATION_INNEW_MAPLOAD 1 //New should call Initialize(TRUE) #define INITIALIZATION_INNEW_REGULAR 2 //New should call Initialize(FALSE) @@ -9,7 +9,7 @@ var/datum/subsystem/atoms/SSatoms init_order = 11 flags = SS_NO_FIRE - var/initialized = INITIALIZATION_INSSOBJ + var/initialized = INITIALIZATION_INSSATOMS var/old_initialized /datum/subsystem/atoms/New() @@ -23,7 +23,7 @@ var/datum/subsystem/atoms/SSatoms return ..() /datum/subsystem/atoms/proc/InitializeAtoms(list/atoms = null) - if(initialized == INITIALIZATION_INSSOBJ) + if(initialized == INITIALIZATION_INSSATOMS) return var/list/late_loaders @@ -73,7 +73,7 @@ var/datum/subsystem/atoms/SSatoms /datum/subsystem/atoms/proc/map_loader_begin() old_initialized = initialized - initialized = INITIALIZATION_INSSOBJ + initialized = INITIALIZATION_INSSATOMS /datum/subsystem/atoms/proc/map_loader_stop() initialized = old_initialized diff --git a/code/controllers/subsystem/processing/objects.dm b/code/controllers/subsystem/processing/objects.dm index 8d262bdc5cc..95e7ee11650 100644 --- a/code/controllers/subsystem/processing/objects.dm +++ b/code/controllers/subsystem/processing/objects.dm @@ -1,16 +1,9 @@ var/datum/subsystem/objects/SSobj - -#define INITIALIZATION_INSSOBJ 0 //New should not call Initialize -#define INITIALIZATION_INNEW_MAPLOAD 1 //New should call Initialize(TRUE) -#define INITIALIZATION_INNEW_REGULAR 2 //New should call Initialize(FALSE) - /datum/subsystem/objects name = "Objects" priority = 40 flags = SS_NO_INIT - var/initialized = INITIALIZATION_INSSOBJ - var/old_initialized var/list/processing = list() var/list/currentrun = list() diff --git a/code/game/atoms.dm b/code/game/atoms.dm index fbf573f5d79..323a599db40 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -41,7 +41,7 @@ light = new(src) var/do_initialize = SSatoms.initialized - if(do_initialize > INITIALIZATION_INSSOBJ) + if(do_initialize > INITIALIZATION_INSSATOMS) args[1] = do_initialize == INITIALIZATION_INNEW_MAPLOAD Initialize(arglist(args)) //. = ..() //uncomment if you are dumb enough to add a /datum/New() proc