From c479af90228f873cf25f67274c927af1252c72ec Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 11 Oct 2015 02:35:53 -0400 Subject: [PATCH 1/3] More Garbage Collection Fixes --- code/game/machinery/atmoalter/portable_atmospherics.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index b0a05d5d3bb..92f3cb8211e 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -35,9 +35,11 @@ update_icon() /obj/machinery/portable_atmospherics/Destroy() + disconnect() qdel(air_contents) + air_contents = null qdel(holding) - + holding = null return ..() /obj/machinery/portable_atmospherics/update_icon() @@ -71,7 +73,7 @@ connected_port = null return 1 - + /obj/machinery/portable_atmospherics/portableConnectorReturnAir() return air_contents From 59ab1dc3cc94e4e4cc52d5adc44d2e26b5a5dca9 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 11 Oct 2015 03:02:38 -0400 Subject: [PATCH 2/3] space pods --- code/game/vehicles/spacepods/spacepod.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm index fbb4a981811..c3afcf2651a 100644 --- a/code/game/vehicles/spacepods/spacepod.dm +++ b/code/game/vehicles/spacepods/spacepod.dm @@ -71,6 +71,20 @@ spacepods_list += src /obj/spacepod/Destroy() + qdel(equipment_system) + equipment_system = null + qdel(battery) + battery = null + qdel(cabin_air) + cabin_air = null + qdel(internal_tank) + internal_tank = null + qdel(pr_int_temp_processor) + pr_int_temp_processor = null + qdel(pr_give_air) + pr_give_air = null + qdel(ion_trail) + ion_trail = null spacepods_list -= src return ..() From 53ea66530ec3554b4d178dedacfee06763dd96b0 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 11 Oct 2015 14:42:23 -0400 Subject: [PATCH 3/3] 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 ..()