Roll the damn changes back, init works now

This commit is contained in:
tigercat2000
2018-10-23 17:48:22 -07:00
parent 8ef1b97f45
commit 88a051e5dc
2 changed files with 6 additions and 1 deletions
+4 -1
View File
@@ -49,9 +49,12 @@
/atom/New(loc, ...)
if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
_preloader.load(src)
. = ..()
attempt_init(...)
// 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, ...)
var/do_initialize = SSatoms.initialized
if(do_initialize != INITIALIZATION_INSSATOMS)
args[1] = do_initialize == INITIALIZATION_INNEW_MAPLOAD
+2
View File
@@ -35,6 +35,8 @@
return
. = ..()
/atom/movable/Destroy()
if(loc)
loc.handle_atom_del(src)