Merge pull request #11115 from Ghommie/Ghommie-cit583

Something more about runtime errors.
2020-02-19 19:03:01 -07:00
parent a10c71320d 5e10f822e6
commit 9589c3116b
10 changed files with 30 additions and 22 deletions
@@ -67,7 +67,8 @@
 /obj/item/gun/energy/Destroy()
 	if(flags_1 & INITIALIZED_1)
 		QDEL_NULL(cell)
-		QDEL_LIST(ammo_type)
+		if(!(flags_1 & HOLOGRAM_1)) //holodeck stuff.
+			QDEL_LIST(ammo_type)
 		STOP_PROCESSING(SSobj, src)
 	return ..()