fixes some stuff, note that the infinite loop is still present but only mitigated

This commit is contained in:
Matt Atlas
2022-02-27 20:00:57 +01:00
parent 184609631b
commit b782b15c92
5 changed files with 431 additions and 66609 deletions

View File

@@ -567,9 +567,9 @@ var/const/access_kataphract_trader = 116
id = access_crate_cash
access_type = ACCESS_TYPE_NONE
/var/const/access_orion_exress_ship = 201
/var/const/access_orion_express_ship = 201
/datum/access/exress_ship
id = access_orion_exress_ship
id = access_orion_express_ship
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_none = -1

View File

@@ -103,13 +103,15 @@
machines += A
if(istype(A,/obj/effect/landmark/map_load_mark))
LAZYADD(subtemplates_to_spawn, A)
if(A.initialized)
atoms -= A
var/notsuspended
if(!SSmachinery.suspended)
SSmachinery.suspend()
notsuspended = TRUE
SSatoms.InitializeAtoms() // The atoms should have been getting queued there. This flushes the queue.
SSatoms.InitializeAtoms(atoms) // The atoms should have been getting queued there. This flushes the queue.
SSmachinery.setup_template_powernets(cables)
SSmachinery.setup_atmos_machinery(atmos_machines)

View File

@@ -377,8 +377,8 @@ var/global/dmm_suite/preloader/_preloader = new
SSatoms.map_loader_begin()
/dmm_suite/proc/create_atom(path, crds)
set waitfor = FALSE
. = new path (crds)
// Doing this async is impossible, as we must return the ref.
return new path (crds)
//text trimming (both directions) helper proc
//optionally removes quotes before and after the text (for variable name)