From b1f097069720482bc32fd4783b4cc55e8e5bfc04 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 5 Apr 2020 11:37:57 -0400 Subject: [PATCH 1/2] Fix runtime in vore_remains if they are mapped in Also make it more robust to preds not having ckeys or names --- code/modules/vore/eating/leave_remains_vr.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm index a95adb094b..f7e9f6d952 100644 --- a/code/modules/vore/eating/leave_remains_vr.dm +++ b/code/modules/vore/eating/leave_remains_vr.dm @@ -70,12 +70,13 @@ var/pred_ckey var/pred_name -/obj/item/weapon/digestion_remains/New(newloc, mob/living/pred) - ..(newloc) - pred_ckey = pred.ckey - pred_name = pred.name +/obj/item/weapon/digestion_remains/Initialize(var/mapload, var/mob/living/pred) + . = ..() + if(!mapload) + pred_ckey = pred?.ckey + pred_name = pred?.name -/obj/item/weapon/digestion_remains/attack_self(mob/user) +/obj/item/weapon/digestion_remains/attack_self(var/mob/user) if(user.a_intent == I_HURT) to_chat(user,"As you squeeze the [name], it crumbles into dust and falls apart into nothing!") qdel(src) From d880b61cfdc151dff9f4fead2f1f50b6c0b37db5 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 5 Apr 2020 11:58:14 -0400 Subject: [PATCH 2/2] 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)