mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
Roll the damn changes back, init works now
This commit is contained in:
+4
-1
@@ -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
|
||||
|
||||
@@ -35,6 +35,8 @@
|
||||
return
|
||||
. = ..()
|
||||
|
||||
|
||||
|
||||
/atom/movable/Destroy()
|
||||
if(loc)
|
||||
loc.handle_atom_del(src)
|
||||
|
||||
Reference in New Issue
Block a user