From 8ea9a9a1aad5a53bde5222dcc570f49025aebe0a Mon Sep 17 00:00:00 2001
From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Date: Sun, 9 Jun 2024 12:13:19 -0700
Subject: [PATCH] [MIRROR] some GC things (#8507)

Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 code/game/objects/effects/decals/cleanable.dm  | 2 +-
 code/modules/admin/verbs/modify_robot.dm       | 6 +++---
 code/modules/mob/living/silicon/robot/robot.dm | 2 +-
 code/modules/vore/eating/digest_act_vr.dm      | 6 +++---
 code/modules/xenobio2/mob/xeno.dm              | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index c14373dc47..5b0bb30a61 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -26,7 +26,7 @@ generic_filth = TRUE means when the decal is saved, it will be switched out for
 
 /obj/effect/decal/cleanable/Destroy()
 	SSpersistence.forget_value(src, /datum/persistent/filth)
-	qdel(jan_icon)
+	QDEL_NULL(jan_icon)
 	. = ..()
 
 /obj/effect/decal/cleanable/clean_blood(var/ignore = 0)
diff --git a/code/modules/admin/verbs/modify_robot.dm b/code/modules/admin/verbs/modify_robot.dm
index 6db3ffbdd1..f28f168119 100644
--- a/code/modules/admin/verbs/modify_robot.dm
+++ b/code/modules/admin/verbs/modify_robot.dm
@@ -76,7 +76,7 @@
 					var/obj/item/weapon/robot_module/robot/robot_type = new module_type(robot)
 					robot.emag_items = 1
 					if(!istype(robot_type, /obj/item/weapon/robot_module/robot/))
-						robot.Destroy()
+						qdel(robot)
 						break
 					var/list/all_modules = robot.module.modules
 					all_modules += robot.module.emag
@@ -134,7 +134,7 @@
 									target.module.synths.Add(item_with_matter.plastic)
 								else
 									item_with_matter.plastic = target.module.synths[found]
-					robot.Destroy()
+					qdel(robot)
 			if(MODIFIY_ROBOT_MODULE_REMOVE)
 				while(TRUE)
 					var/list/active_modules = target.module.modules
@@ -326,7 +326,7 @@
 				target.hud_used.update_robot_modules_display(TRUE)
 				target.modtype = initial(target.modtype)
 				target.module.Reset(target)
-				target.module.Destroy()
+				qdel(target.module)
 				target.modtype = selected_module
 				var/module_type = robot_modules[selected_module]
 				target.transform_with_anim()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 6bfb5cf66a..be932a44a3 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -854,7 +854,7 @@
 	if(notify)
 		notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, module.name)
 	module.Reset(src)
-	module.Destroy()
+	qdel(module)
 	module = null
 	updatename("Default")
 	has_recoloured = FALSE
diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm
index 05de3d871f..d294f63afe 100644
--- a/code/modules/vore/eating/digest_act_vr.dm
+++ b/code/modules/vore/eating/digest_act_vr.dm
@@ -16,7 +16,7 @@
 			V.ghostize(0) //CHOMPAdd - Prevent Reenter Corpse sending observers to the shadow realm
 			V.stat = DEAD //CHOMPAdd - Helps with autosleeving
 			if(V.mind) V.mind.vore_death = 1 //CHOMPAdd - Digested item TFs get vore_death timer
-			V.Destroy() //Destroy the voice.
+			qdel(V)
 		for(var/mob/living/M in contents)//Drop mobs from objects(shoes) before deletion
 			M.forceMove(item_storage)
 		for(var/obj/item/O in contents)
@@ -81,7 +81,7 @@
 				P.id = null
 		/* CHOMPEdit Start - This is handled lower down now
 		for(var/mob/living/voice/V in possessed_voice) // Delete voices.
-			V.Destroy() //Destroy the voice.
+			qdel(V) //Destroy the voice.
 		CHOMPEdit End */
 		for(var/mob/living/M in contents)//Drop mobs from objects(shoes) before deletion
 			if(item_storage)
@@ -119,7 +119,7 @@
 				V.ghostize(0) //CHOMPAdd - Prevent Reenter Corpse sending observers to the shadow realm
 				V.stat = DEAD //CHOMPAdd - Helps with autosleeving
 				if(V.mind) V.mind.vore_death = 1 //CHOMPAdd - Digested item TFs get vore_death timer
-				V.Destroy() //Destroy the voice.
+				qdel(V) //Destroy the voice.
 		if(istype(B) && recycled)
 		//CHOMPEdit End
 			g_damage = w_class / 2
diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm
index 9d54c55b60..f53659b17b 100644
--- a/code/modules/xenobio2/mob/xeno.dm
+++ b/code/modules/xenobio2/mob/xeno.dm
@@ -101,6 +101,6 @@ Also includes Life and New
 		stasis += hit.stasisforce
 	..()
 
-/mob/living/simple_animal/xeno/Destroy()
+/mob/living/simple_mob/xeno/Destroy()
 	QDEL_NULL(traitdat)
 	..()