mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-26 01:52:15 +00:00
fixes some stuff, note that the infinite loop is still present but only mitigated
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user