Converts Most Destroys to use QDEL_NULL

This commit is contained in:
Fox-McCloud
2017-04-04 23:08:41 -04:00
parent ba8b1dae55
commit 5631d36ff8
121 changed files with 217 additions and 468 deletions
+2 -6
View File
@@ -31,12 +31,8 @@
RefreshParts()
/obj/machinery/biogenerator/Destroy()
if(beaker)
qdel(beaker)
beaker = null
if(files)
qdel(files)
files = null
QDEL_NULL(beaker)
QDEL_NULL(files)
return ..()
/obj/machinery/biogenerator/ex_act(severity)
+3 -9
View File
@@ -36,12 +36,8 @@
reagent_genes.Cut()
trait_genes.Cut()
target = null
if(seed)
qdel(seed)
seed = null
if(disk)
qdel(disk)
disk = null
QDEL_NULL(seed)
QDEL_NULL(disk)
return ..()
/obj/machinery/plantgenes/RefreshParts()
@@ -384,9 +380,7 @@
pixel_y = rand(-5, 5)
/obj/item/weapon/disk/plantgene/Destroy()
if(gene)
qdel(gene)
gene = null
QDEL_NULL(gene)
return ..()
/obj/item/weapon/disk/plantgene/attackby(obj/item/weapon/W, mob/user, params)
+1 -3
View File
@@ -40,9 +40,7 @@
add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/Destroy()
if(seed)
qdel(seed)
seed = null
QDEL_NULL(seed)
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/proc/add_juice()
+1 -3
View File
@@ -32,9 +32,7 @@
add_juice()
/obj/item/weapon/grown/Destroy()
if(seed)
qdel(seed)
seed = null
QDEL_NULL(seed)
return ..()
/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params)
+1 -3
View File
@@ -75,9 +75,7 @@
plant_hud_set_water()
/obj/machinery/hydroponics/Destroy()
if(myseed)
qdel(myseed)
myseed = null
QDEL_NULL(myseed)
return ..()
/obj/machinery/hydroponics/constructable/attackby(obj/item/I, mob/user, params)