From fe5a83ea525dc5f40dc097c57eff472cb07bd360 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 31 Jan 2020 01:22:53 -0700
Subject: [PATCH 1/4] Update gun.dm

---
 code/modules/projectiles/gun.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index fe5c4a1bbf..0c2b5e013e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -76,6 +76,13 @@
 	if(zoomable)
 		azoom = new (src)
 
+/obj/item/gun/Destroy()
+	QDEL_NULL(pin)
+	QDEL_NULL(gun_light)
+	QDEL_NULL(bayonet)
+	QDEL_NULL(chambered)
+	return ..()
+
 /obj/item/gun/CheckParts(list/parts_list)
 	..()
 	var/obj/item/gun/G = locate(/obj/item/gun) in contents

From 9e08f8bed79af867bc96579174022851946582ce Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 31 Jan 2020 01:23:38 -0700
Subject: [PATCH 2/4] Update energy.dm

---
 code/modules/projectiles/guns/energy.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 1329e5418f..3ca732eb0b 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -58,6 +58,7 @@
 
 /obj/item/gun/energy/Destroy()
 	QDEL_NULL(cell)
+	QDEL_LIST(ammo_type)
 	STOP_PROCESSING(SSobj, src)
 	return ..()
 

From 885b22371beca62baf81368fe95f448ffc13e8bf Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 31 Jan 2020 01:25:39 -0700
Subject: [PATCH 3/4] Update _ammunition.dm

---
 code/modules/projectiles/ammunition/_ammunition.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm
index b621033123..1404529700 100644
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ b/code/modules/projectiles/ammunition/_ammunition.dm
@@ -34,6 +34,11 @@
 	setDir(pick(GLOB.alldirs))
 	update_icon()
 
+/obj/item/ammo_casing/Destroy()
+	if(BB)
+		QDEL_NULL(BB)
+	return ..()
+
 /obj/item/ammo_casing/update_icon()
 	..()
 	icon_state = "[initial(icon_state)][BB ? "-live" : ""]"

From 0d15a0ec8b6381c892698eba535d7401d2bb77f8 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 31 Jan 2020 01:26:48 -0700
Subject: [PATCH 4/4] Update projectile.dm

---
 code/modules/projectiles/projectile.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 55a75e1688..a902c545b8 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -643,11 +643,11 @@
 			Bump(original)
 
 /obj/item/projectile/Destroy()
+	STOP_PROCESSING(SSprojectiles, src)
 	if(hitscan)
 		finalize_hitscan_and_generate_tracers()
-	STOP_PROCESSING(SSprojectiles, src)
 	cleanup_beam_segments()
-	qdel(trajectory)
+	QDEL_NULL(trajectory)
 	return ..()
 
 /obj/item/projectile/proc/cleanup_beam_segments()