Merge pull request #3337 from ARF-SS13/fix-even-more-runtimes

Try to un-runtime the runtimes
ARF-SS13 · Oct 13, 2023 · 5d714a1 · 5d714a1
2 parents abb9f6c + a67bf29
commit 5d714a1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git 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))

diff --git 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

diff --git 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)
+	last_mind = null
 	GLOB.carbon_list -= src
 	moveToNullspace() // suckit
 	return QDEL_HINT_LETMELIVE

diff --git 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
@@ -22,6 +22,8 @@ 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)
 
 	return ..() // Coyote Modify, Mobs wont lag the server when gibbed :o
 

diff --git 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()