From b0e4e46255d1eec0fcbbc7aff6bf850dce18ff17 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Thu, 1 Feb 2024 14:10:23 -0800 Subject: [PATCH 1/3] Bump alternative tests to 515.1630 --- .github/alternate_byond_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt index 005803964cca..c96908590dac 100644 --- a/.github/alternate_byond_versions.txt +++ b/.github/alternate_byond_versions.txt @@ -6,4 +6,4 @@ # Example: # 500.1337: runtimestation -515.1610: lv624 +515.1630: lv624 From 46a95d40d5262c59385d138ea12253ae84127dd4 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Thu, 1 Feb 2024 16:19:09 -0800 Subject: [PATCH 2/3] From TG 79134 for hard delete after subsystems finish loading. --- code/controllers/mc/globals.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/controllers/mc/globals.dm b/code/controllers/mc/globals.dm index 7b5cc94d3620..724f58010699 100644 --- a/code/controllers/mc/globals.dm +++ b/code/controllers/mc/globals.dm @@ -13,7 +13,11 @@ 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)) + QDEL_IN(exclude_these, 0) //signal logging isn't ready log_world("[vars.len - gvars_datum_in_built_vars.len] global variables") From e0418813d2469065439c74beb9b05004380a5db3 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Thu, 1 Feb 2024 16:21:26 -0800 Subject: [PATCH 3/3] Mine hard del --- code/game/objects/items/explosives/mine.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm index 70a2bba6056d..45065a2de1de 100644 --- a/code/game/objects/items/explosives/mine.dm +++ b/code/game/objects/items/explosives/mine.dm @@ -266,6 +266,8 @@ /obj/effect/mine_tripwire/Destroy() if(linked_claymore) + if(linked_claymore.tripwire == src) + linked_claymore.tripwire = null linked_claymore = null . = ..()