From a96375a54e339db6ef153e1aef28a7e30e63c6df Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 9 Oct 2015 17:14:49 -0400 Subject: [PATCH] more del to qdel --- code/ATMOSPHERICS/pipes/pipe.dm | 4 ++-- code/game/atoms.dm | 1 - code/game/machinery/cryopod.dm | 2 +- .../game/objects/structures/transit_tubes/transit_tube_pod.dm | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/ATMOSPHERICS/pipes/pipe.dm b/code/ATMOSPHERICS/pipes/pipe.dm index b02d990b432..8e22e40b06e 100644 --- a/code/ATMOSPHERICS/pipes/pipe.dm +++ b/code/ATMOSPHERICS/pipes/pipe.dm @@ -35,7 +35,7 @@ if(parent && isnull(parent.gcDestroyed)) qdel(parent) parent = null - + /obj/machinery/atmospherics/pipe/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/analyzer)) atmosanalyzer_scan(parent.air, user) @@ -51,7 +51,7 @@ /obj/machinery/atmospherics/pipe/proc/check_pressure(pressure) //Return 1 if parent should continue checking other pipes - //Return null if parent should stop checking other pipes. Recall: del(src) will by default return null + //Return null if parent should stop checking other pipes. Recall: qdel(src) will by default return null return 1 diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f6bcfef4171..ecd7a5db8f0 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -34,7 +34,6 @@ if(reagents) qdel(reagents) reagents = null - set_opacity(0) invisibility = 101 return ..() diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 5f3ababb864..24c7acc269e 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -317,7 +317,7 @@ occupant.unEquip(W) W.loc = src - if(W.contents.len) //Make sure we catch anything not handled by del() on the items. + if(W.contents.len) //Make sure we catch anything not handled by qdel() on the items. var/preserve = null for(var/T in preserve_items) if(istype(W,T)) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 61459684816..eabfcba148b 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -90,7 +90,7 @@ moving = 0 -// Should I return a copy here? If the caller edits or del()s the returned +// Should I return a copy here? If the caller edits or qdel()s the returned // datum, there might be problems if I don't... /obj/structure/transit_tube_pod/return_air() var/datum/gas_mixture/GM = new()