Merge pull request #7252 from Citadel-Station-13/upstream-merge-38708

[MIRROR] Fix runtimes when energy guns are deleted
2018-07-01 09:28:20 -05:00
parent 999f3c23d7 98ee49728f
commit fe0c43fea2
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