From 463945ec76b3cc4046109082b2dc1d14c9c07b2e Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 25 Jun 2018 15:11:28 -0400
Subject: [PATCH 1/2] Merge pull request #38708 from
 AutomaticFrenzy/patch/energy-gun

Fix runtimes when energy guns are deleted
---
 code/modules/projectiles/guns/energy.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 2a352932fa..be25a13734 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -130,6 +130,8 @@
 	return
 
 /obj/item/gun/energy/update_icon(force_update)
+	if(QDELETED(src))
+		return
 	..()
 	if(!automatic_charge_overlays)
 		return