From bdb765a8ea3ee19ca8aea66f952317bf5c973916 Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 15 Aug 2023 17:03:28 +1000 Subject: [PATCH] Attempts to fix two different cascading runtimes --- code/_helpers/_lists.dm | 2 +- .../living/carbon/human/species/station/prommie_blob.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/_helpers/_lists.dm b/code/_helpers/_lists.dm index 5631fa8807..76299d4879 100644 --- a/code/_helpers/_lists.dm +++ b/code/_helpers/_lists.dm @@ -361,7 +361,7 @@ Checks if a list has the same entries and values as an element of big. if(isnull(L) || L.len < 2) return L var/middle = L.len / 2 + 1 - return mergeAtoms(sortAtom(L.Copy(0,middle)), sortAtom(L.Copy(middle)), order) + return mergeAtoms(sortAtom(L.Copy(1,middle)), sortAtom(L.Copy(middle)), order) //Mergsort: does the actual sorting and returns the results back to sortAtom /proc/mergeAtoms(var/list/atom/L, var/list/atom/R, var/order = 1) diff --git a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm index 665bfdcd10..7006dd9968 100644 --- a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm @@ -65,9 +65,9 @@ humanform = null drop_l_hand() drop_r_hand() - mob_radio.forceMove(loc) + drop_from_inventory(mob_radio, loc) mob_radio = null - myid.forceMove(loc) + drop_from_inventory(myid, loc) myid = null vore_organs = null vore_selected = null @@ -76,8 +76,8 @@ /mob/living/carbon/human/Destroy() if(stored_blob) - stored_blob.l_hand.forceMove(loc) - stored_blob.r_hand.forceMove(loc) + stored_blob.drop_l_hand() + stored_blob.drop_r_hand() stored_blob = null qdel(stored_blob) return ..()