From bfa14f2c2557b8a7d036dae9e6ec697d99832f22 Mon Sep 17 00:00:00 2001 From: Leshana Date: Mon, 2 Mar 2020 13:58:42 -0500 Subject: [PATCH 1/3] Cause the maploader to log an error if dmm file contains an undefined type. This will greatly ease debugging as otherwise the only error you might get is Runtime in reader.dm,370: list index out of bounds, and even then only if the turf has no objects. --- code/modules/maps/tg/reader.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/maps/tg/reader.dm b/code/modules/maps/tg/reader.dm index a95f16a287..6efb035a3f 100644 --- a/code/modules/maps/tg/reader.dm +++ b/code/modules/maps/tg/reader.dm @@ -292,6 +292,7 @@ var/global/use_preloader = FALSE old_position = dpos + 1 if(!atom_def) // Skip the item if the path does not exist. Fix your crap, mappers! + error("Maploader skipping undefined type: '[trim_text(copytext(full_def, 1, variables_start))]' (key=[model_key])") continue members.Add(atom_def) From ba03c3321ec2bace845edde05c769c3d0d32b82d Mon Sep 17 00:00:00 2001 From: Leshana Date: Tue, 7 Apr 2020 03:58:27 -0400 Subject: [PATCH 2/3] Port 7056: Make blood etc decals vanish when overmap ships fly away. --- code/game/turfs/space/space.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index e2ca7f36f6..29bad72682 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -45,7 +45,7 @@ if(!AM.anchored) AM.throw_at(get_step(src,reverse_direction(direction)), 5, 1) - else if (istype(AM, /obj/effect)) + else if (istype(AM, /obj/effect/decal)) qdel(AM) //No more space blood coming with the shuttle /turf/space/proc/build_overedge(var/forced_dirs) From 491d94d850df10f6b9805e56b773cff1327c6558 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 5 Apr 2020 11:58:14 -0400 Subject: [PATCH 3/3] Port 7145: CHECK_TICK in xenoarch setup for the sake of largermaps --- code/controllers/subsystems/xenoarch.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/controllers/subsystems/xenoarch.dm b/code/controllers/subsystems/xenoarch.dm index c8184d783e..2e22213ee6 100644 --- a/code/controllers/subsystems/xenoarch.dm +++ b/code/controllers/subsystems/xenoarch.dm @@ -99,6 +99,9 @@ SUBSYSTEM_DEF(xenoarch) if(isnull(M.artifact_find) && digsite != DIGSITE_GARDEN && digsite != DIGSITE_ANIMAL) artifact_spawning_turfs.Add(archeo_turf) + //Larger maps will convince byond this is an infinite loop, so let go for a second + CHECK_TICK + //create artifact machinery var/num_artifacts_spawn = rand(ARTIFACTSPAWNNUM_LOWER, ARTIFACTSPAWNNUM_UPPER) while(artifact_spawning_turfs.len > num_artifacts_spawn)