From 464deae4e329ebade03a97beb3ed1f98bb17abeb Mon Sep 17 00:00:00 2001
From: Drulikar <drathek@gmail.com>
Date: Thu, 8 Feb 2024 16:41:17 -0800
Subject: [PATCH] Fix fruit counting and refactor out delete_fruit

---
 code/modules/cm_aliens/structures/fruit.dm | 34 ++++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/code/modules/cm_aliens/structures/fruit.dm b/code/modules/cm_aliens/structures/fruit.dm
index 384da5da39a7..7bb710f25019 100644
--- a/code/modules/cm_aliens/structures/fruit.dm
+++ b/code/modules/cm_aliens/structures/fruit.dm
@@ -93,22 +93,6 @@
 	qdel(src)
 	. = ..()
 
-/obj/effect/alien/resin/fruit/proc/delete_fruit()
-	//Notify and update the xeno count
-	if(!QDELETED(bound_xeno))
-		if(!picked)
-			to_chat(bound_xeno, SPAN_XENOHIGHDANGER("We sense one of our fruit has been destroyed."))
-		bound_xeno.current_fruits.Remove(src)
-		var/datum/action/xeno_action/onclick/plant_resin_fruit/prf = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/plant_resin_fruit)
-		prf.update_button_icon()
-
-		if(picked) // No need to update the number, since the fruit still exists (just as a different item)
-			return
-		var/number_of_fruit = length(bound_xeno.current_fruits)
-		prf.button.set_maptext(SMALL_FONTS_COLOR(7, number_of_fruit, "#e69d00"), 19, 2)
-		prf.update_button_icon()
-		bound_xeno = null
-
 /obj/effect/alien/resin/fruit/proc/reduce_timer(maturity_increase)
 	if (mature || timer_id == TIMER_ID_NULL)
 		return
@@ -193,7 +177,19 @@
 	return FALSE
 
 /obj/effect/alien/resin/fruit/Destroy()
-	delete_fruit()
+	//Notify and update the xeno count
+	if(!QDELETED(bound_xeno))
+		if(!picked)
+			to_chat(bound_xeno, SPAN_XENOHIGHDANGER("We sense one of our fruit has been destroyed."))
+		bound_xeno.current_fruits.Remove(src)
+
+		var/number_of_fruit = length(bound_xeno.current_fruits)
+		var/datum/action/xeno_action/onclick/plant_resin_fruit/prf = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/plant_resin_fruit)
+		prf.button.set_maptext(SMALL_FONTS_COLOR(7, number_of_fruit, "#e69d00"), 19, 2)
+		prf.update_button_icon()
+
+	bound_xeno = null
+
 	return ..()
 
 //Greater
@@ -281,9 +277,9 @@
 	..()
 	START_PROCESSING(SSobj, src)
 
-/obj/effect/alien/resin/fruit/spore/delete_fruit()
+/obj/effect/alien/resin/fruit/spore/Destroy()
 	STOP_PROCESSING(SSobj, src)
-	..()
+	return ..()
 
 /obj/effect/alien/resin/fruit/spore/process()
 	if(mature)