From 953aeaff4ae506103b227efbeca7a8cfb236f525 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 9 Jan 2023 12:36:16 +0100
Subject: [PATCH] [MIRROR] Clean up something else which was failing CI [MDB
 IGNORE] (#18372)

* Clean up something else which was failing CI (#72299)

## About The Pull Request

Well my last PR passed the CI but everything else is still failing and I
want a little tick next to my pull requests.
So I guess I'm whacking moles until everything that 515 doesn't know how
to dispose of is disposed of?

I'll be honest I don't know what change makes this a requirement when it
wasn't before but it seems like a logical thing to be doing.
Unfortunately running this test locally doesn't produce a failure for me
so my only solution is to keep getting the CI to do it and hope that it
doesn't report a false positive again.

## Why It's Good For The Game

![image](https://user-images.githubusercontent.com/7483112/209726114-4a6da427-f82b-433b-a7ef-39591dc72e7b.png)

## Changelog

Not player facing

* Clean up something else which was failing CI

* modular m90

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
---
 code/game/atoms.dm                                            | 4 +++-
 code/modules/mining/minebot.dm                                | 1 +
 code/modules/mob/living/simple_animal/bot/firebot.dm          | 4 ++++
 code/modules/mob/living/simple_animal/simple_animal.dm        | 1 +
 code/modules/projectiles/guns/ballistic/automatic.dm          | 4 ++++
 .../code/modules/projectiles/guns/ballistic/automatic.dm      | 4 ++++
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index b4cbc3ce3d5..6dfa790ddcf 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -325,8 +325,10 @@
 
 	LAZYNULL(managed_overlays)
 
-	QDEL_NULL(light)
 	QDEL_NULL(ai_controller)
+	QDEL_NULL(light)
+	if (length(light_sources))
+		light_sources.Cut()
 
 	if(smoothing_flags & SMOOTH_QUEUED)
 		SSicon_smooth.remove_from_queues(src)
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index e09ae57ebd5..8ba7dc8f8bc 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -64,6 +64,7 @@
 	SetCollectBehavior()
 
 /mob/living/simple_animal/hostile/mining_drone/Destroy()
+	QDEL_NULL(stored_gun)
 	for (var/datum/action/innate/minedrone/action in actions)
 		qdel(action)
 	return ..()
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
index 82a10b14639..650b28fcb63 100644
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/firebot.dm
@@ -49,6 +49,10 @@
 	create_extinguisher()
 	AddElement(/datum/element/atmos_sensitive, mapload)
 
+/mob/living/simple_animal/bot/firebot/Destroy()
+	QDEL_NULL(internal_ext)
+	return ..()
+
 /mob/living/simple_animal/bot/firebot/bot_reset()
 	create_extinguisher()
 
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1e574f433a5..3f206619222 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -221,6 +221,7 @@
 		adjustStaminaLoss(-stamina_recovery * delta_time, FALSE, TRUE)
 
 /mob/living/simple_animal/Destroy()
+	QDEL_NULL(access_card)
 	GLOB.simple_animals[AIStatus] -= src
 	SSnpcpool.currentrun -= src
 
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 6b9f4258a77..d006e3e4138 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -167,6 +167,10 @@
 	underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher(src)
 	update_appearance()
 
+/obj/item/gun/ballistic/automatic/m90/Destroy()
+	QDEL_NULL(underbarrel)
+	return ..()
+
 /obj/item/gun/ballistic/automatic/m90/unrestricted
 	pin = /obj/item/firing_pin
 
diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm
index 0d1ccc310e8..6864d0611b6 100644
--- a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -126,6 +126,10 @@
 	underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher(src)
 	update_appearance()
 
+/obj/item/gun/ballistic/automatic/m90/Destroy()
+	QDEL_NULL(underbarrel)
+	return ..()
+
 /obj/item/gun/ballistic/automatic/m90/unrestricted
 	pin = /obj/item/firing_pin