Fix atom init again

This commit is contained in:
tigercat2000
2018-10-23 18:48:56 -07:00
parent 88a051e5dc
commit 13a095ec4a
2 changed files with 3 additions and 2 deletions
+1
View File
@@ -468,6 +468,7 @@
/obj/screen/component_button
var/obj/screen/parent
/obj/screen/component_button/Initialize(mapload, obj/screen/new_parent)
. = ..()
parent = new_parent
+2 -2
View File
@@ -50,11 +50,11 @@
if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
_preloader.load(src)
. = ..()
attempt_init(...)
attempt_init(arglist(args))
// This is distinct from /tg/ because of our space management system
// This is overriden in /atom/movable and the parent isn't called if the SMS wants to deal with it's init
/atom/proc/attempt_init(loc, ...)
/atom/proc/attempt_init(...)
var/do_initialize = SSatoms.initialized
if(do_initialize != INITIALIZATION_INSSATOMS)
args[1] = do_initialize == INITIALIZATION_INNEW_MAPLOAD