welp

shiptest-ss13 · Jan 18, 2024 · 33adeac · 33adeac
1 parent baf1158
commit 33adeac
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
@@ -13,7 +13,14 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
 	GLOB = src
 
 	var/datum/controller/exclude_these = new
-	gvars_datum_in_built_vars = exclude_these.vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order))
+	// I know this is dumb but the nested vars list hangs a ref to the datum. This fixes that
+	var/list/controller_vars = exclude_these.vars.Copy()
+	controller_vars["vars"] = null
+	gvars_datum_in_built_vars = controller_vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order))
+
+#if MIN_COMPILER_VERSION >= 515 && MIN_COMPILER_BUILD > 1627
+	#warn datum.vars hanging a ref should now be fixed, there should be no reason to remove the vars list from our controller's vars list anymore
+#endif
 	QDEL_IN(exclude_these, 0) //signal logging isn't ready
 	log_world("[vars.len - gvars_datum_in_built_vars.len] global variables")