another huge sync

2017-06-21 18:00:00 -05:00
parent 0719541100
commit d04001c09d
51 changed files with 1443 additions and 981 deletions
@@ -98,7 +98,7 @@ SUBSYSTEM_DEF(atoms)
 	else if(!A.initialized)
 		BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT

-	return qdeleted || QDELETED(A)
+	return qdeleted || QDELING(A)

 /datum/controller/subsystem/atoms/proc/map_loader_begin()
 	old_initialized = initialized