From cef17f6d4cd88beabc4883b110e86270b4485edf Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Sun, 8 Oct 2023 20:56:46 -0400 Subject: [PATCH 1/7] Try to un-runtime the runtimes --- code/modules/mob/living/carbon/carbon.dm | 1 + code/modules/mob/living/living.dm | 1 + code/modules/mob/mob.dm | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e289fb59d61..bfda44e93e8 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -20,6 +20,7 @@ hand_bodyparts = null //Just references out bodyparts, don't need to delete twice. remove_from_all_data_huds() QDEL_NULL(dna) + QDEL_NULL(last_mind) GLOB.carbon_list -= src /mob/living/carbon/relaymove(mob/user, direction) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index daab0b25b05..696117f0c82 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -57,6 +57,7 @@ remove_from_all_data_huds() GLOB.mob_living_list -= src QDEL_LIST(diseases) + QDEL_LIST(mob_quirks) return ..() /mob/living/onZImpact(turf/T, levels) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 16c367c0f99..d1c98e340a2 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -22,6 +22,11 @@ GLOBAL_VAR_INIT(pixel_slide_other_has_help_int, 0) //This variable queries whet qdel(cc) client_colours = null ghostize() + QDEL_LIST(actions) + QDEL_LIST(mob_spell_list) + QDEL_NULL(mind) + if (LAZYLEN(datum_components)) + QDEL_LIST_ASSOC_VAL(datum_components) return ..() // Coyote Modify, Mobs wont lag the server when gibbed :o From fd02ba2c126323902371828852a86fe504858022 Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Sun, 8 Oct 2023 21:04:29 -0400 Subject: [PATCH 2/7] Don't qdel datum components --- code/modules/mob/mob.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d1c98e340a2..33c20a82ffd 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -25,8 +25,6 @@ GLOBAL_VAR_INIT(pixel_slide_other_has_help_int, 0) //This variable queries whet QDEL_LIST(actions) QDEL_LIST(mob_spell_list) QDEL_NULL(mind) - if (LAZYLEN(datum_components)) - QDEL_LIST_ASSOC_VAL(datum_components) return ..() // Coyote Modify, Mobs wont lag the server when gibbed :o From 00142be45a2dd662bac531582a2dce6a7e548471 Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Sun, 8 Oct 2023 21:18:24 -0400 Subject: [PATCH 3/7] If you don't have anything to say, don't say it --- code/datums/traits/_quirk.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index 3700c655cbc..c56d8e06c7f 100644 --- a/code/datums/traits/_quirk.dm +++ b/code/datums/traits/_quirk.dm @@ -61,7 +61,8 @@ STOP_PROCESSING(SSquirks, src) remove() if(quirk_holder) - to_chat(quirk_holder, lose_text) + if(lose_text) + to_chat(quirk_holder, lose_text) quirk_holder.mob_quirks -= src if(mob_trait) if(!islist(mob_trait)) From 113132b848b6b2c33b1544041cd4fe998cba8854 Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Mon, 9 Oct 2023 07:21:40 -0400 Subject: [PATCH 4/7] Don't delete the mind, we need that --- code/modules/mob/mob.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 33c20a82ffd..2fca7fdeeb1 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -24,7 +24,6 @@ GLOBAL_VAR_INIT(pixel_slide_other_has_help_int, 0) //This variable queries whet ghostize() QDEL_LIST(actions) QDEL_LIST(mob_spell_list) - QDEL_NULL(mind) return ..() // Coyote Modify, Mobs wont lag the server when gibbed :o From ff99332b2c1255d22d55078601f81c098fd4dcd6 Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Mon, 9 Oct 2023 07:39:03 -0400 Subject: [PATCH 5/7] Don't qdel last_mind either --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index bfda44e93e8..b1fc9a79952 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -20,7 +20,7 @@ hand_bodyparts = null //Just references out bodyparts, don't need to delete twice. remove_from_all_data_huds() QDEL_NULL(dna) - QDEL_NULL(last_mind) + last_mind = null GLOB.carbon_list -= src /mob/living/carbon/relaymove(mob/user, direction) From 11b508acb1ded712d69f860612f9edc86d9267cc Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Mon, 9 Oct 2023 17:55:21 -0400 Subject: [PATCH 6/7] Fix yet more runtimes. --- code/modules/reagents/chemistry/holder.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 9b4971bef1c..a67cfa119f0 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -193,7 +193,7 @@ var/part = amount / src.total_volume var/trans_data = null var/list/transferred = list() - if (part > 0 && amount > 0) //You cannot transfer a negative part or amount + if (part > 0 && amount > 0) // You cannot transfer a negative part or amount for(var/reagent in cached_reagents) var/datum/reagent/T = reagent var/transfer_amount = T.volume * part @@ -236,12 +236,13 @@ amount = min(min(amount, total_volume), R.maximum_volume-R.total_volume) var/part = amount / total_volume var/trans_data = null - for(var/reagent in cached_reagents) - var/datum/reagent/T = reagent - var/copy_amount = T.volume * part - if(preserve_data) - trans_data = T.data - R.add_reagent(T.type, copy_amount * multiplier, trans_data) + if (part > 0 && amount > 0) // You cannot transfer a negative amount + for(var/reagent in cached_reagents) + var/datum/reagent/T = reagent + var/copy_amount = T.volume * part + if(preserve_data) + trans_data = T.data + R.add_reagent(T.type, copy_amount * multiplier, trans_data) src.update_total() R.update_total() From a67bf29214d79696240eda640f12f8b636b6fa83 Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Mon, 9 Oct 2023 21:44:36 -0400 Subject: [PATCH 7/7] Add timer --- code/datums/world_topic.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 2bed7a55594..3bcbeb948e0 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -285,6 +285,7 @@ .["Nash"] = oasis .["Wastelanders"] = wastelanders .["Other"] = misc + .["Round Time"] = ROUND_TIME return json_encode(.) /datum/world_topic/jsonrevision