From 13a095ec4ad3a3d98a65bfcb5c72cc1d297e1208 Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Tue, 23 Oct 2018 18:48:56 -0700 Subject: [PATCH] Fix atom init again --- code/_onclick/hud/screen_objects.dm | 1 + code/game/atoms.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 2a3fd70984e..8847e990338 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -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 diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 5b88b2c0d06..5ca34ceb57e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -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