From 53ea66530ec3554b4d178dedacfee06763dd96b0 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sun, 11 Oct 2015 14:42:23 -0400
Subject: [PATCH] more things

---
 code/game/machinery/hologram.dm          | 7 ++++---
 code/game/vehicles/spacepods/spacepod.dm | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 4c492d20cf2..aa848a1b097 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -141,7 +141,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 
 /obj/machinery/hologram/holopad/proc/clear_holo()
 //	hologram.set_light(0)//Clear lighting.	//handled by the lighting controller when its ower is deleted
-	del(hologram)//Get rid of hologram.
+	qdel(hologram)//Get rid of hologram.
+	hologram = null
 	if(master.holo == src)
 		master.holo = null
 	master = null//Null the master, since no-one is using it now.
@@ -222,9 +223,9 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	qdel(src)
 	return
 
-/obj/machinery/hologram/Destroy()
+/obj/machinery/hologram/holopad/Destroy()
 	if(hologram)
-		src:clear_holo()
+		clear_holo()
 	return ..()
 
 /*
diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm
index c3afcf2651a..635ee587290 100644
--- a/code/game/vehicles/spacepods/spacepod.dm
+++ b/code/game/vehicles/spacepods/spacepod.dm
@@ -85,6 +85,12 @@
 	pr_give_air = null
 	qdel(ion_trail)
 	ion_trail = null
+	if(occupant)
+		occupant.forceMove(get_turf(src))
+		occupant = null
+	if(occupant2)
+		occupant2.forceMove(get_turf(src))
+		occupant2 = null
 	spacepods_list -= src
 	return ..()