Merge pull request #38708 from AutomaticFrenzy/patch/energy-gun

Fix runtimes when energy guns are deleted
2018-06-25 15:11:28 -04:00
parent 791dcaac05
commit 463945ec76
1 changed files with 2 additions and 0 deletions
@@ -130,6 +130,8 @@
 	return

 /obj/item/gun/energy/update_icon(force_update)
+	if(QDELETED(src))
+		return
 	..()
 	if(!automatic_charge_overlays)
 		return