more things

This commit is contained in:
Fox-McCloud
2015-10-11 14:42:23 -04:00
parent 59ab1dc3cc
commit 53ea66530e
2 changed files with 10 additions and 3 deletions
+4 -3
View File
@@ -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 ..()
/*
+6
View File
@@ -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 ..()