From aba636a44c4dd4c92242dfd65b4d5fb636d6ea29 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Mon, 17 Feb 2020 00:13:16 +0100
Subject: [PATCH] ok

---
 code/modules/projectiles/guns/energy.dm | 3 ++-
 code/modules/surgery/organs/eyes.dm     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index be43bc48fd..d98878bb67 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -67,7 +67,8 @@
 /obj/item/gun/energy/Destroy()
 	if(flags_1 & INITIALIZED_1)
 		QDEL_NULL(cell)
-		QDEL_LIST(ammo_type)
+		if(!(O.flags_1 & HOLOGRAM_1)) //holodeck stuff.
+			QDEL_LIST(ammo_type)
 		STOP_PROCESSING(SSobj, src)
 	return ..()
 
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 44e92e464b..bdd1a444bb 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -56,7 +56,7 @@
 			var/mob/living/carbon/human/H = C
 			H.eye_color = old_eye_color
 			if(!special)
-				H.dna.species.handle_body()
+				H.dna.species.handle_body(H)
 		if(!special)
 			C.update_tint()
 			C.update_sight()