Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2

Fixing a little issue with the Holodeck's Kobayashi Maru phaser
2020-03-06 00:19:51 -07:00
parent 61121abc69 beef891789
commit d376b99af6
3 changed files with 16 additions and 4 deletions
@@ -67,8 +67,7 @@
 /obj/item/gun/energy/Destroy()
 	if(flags_1 & INITIALIZED_1)
 		QDEL_NULL(cell)
-		if(!(flags_1 & HOLOGRAM_1)) //holodeck stuff.
-			QDEL_LIST(ammo_type)
+		QDEL_LIST(ammo_type)
 		STOP_PROCESSING(SSobj, src)
 	return ..()