mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 22:17:32 +01:00
Fix atom init again
This commit is contained in:
@@ -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
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user