Merge pull request #3511 from VOREStation/garbage-subsystem

tg Garbage Subsystem

code/game/objects/buckling.dm

@@ -21,11 +21,6 @@
 	if(can_buckle && istype(M))
 		user_buckle_mob(M, user)
 
-//Cleanup
-/obj/Del()
-	unbuckle_mob()
-	return ..()
-
 /obj/Destroy()
 	unbuckle_mob()
 	return ..()

code/game/objects/effects/effect_system.dm

@@ -13,11 +13,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	unacidable = 1//So effect are not targeted by alien acid.
 	pass_flags = PASSTABLE | PASSGRILLE
 
-/obj/effect/Destroy()
-	if(reagents)
-		reagents.delete()
-	return ..()
-
 /datum/effect/effect/system
 	var/number = 3
 	var/cardinals = 0

code/game/objects/items/devices/PDA/PDA.dm

@@ -1470,8 +1470,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/device/pda/Destroy()
 	PDAs -= src
 	if (src.id && prob(90)) //IDs are kept in 90% of the cases
-		src.id.loc = get_turf(src.loc)
-	..()
+		src.id.forceMove(get_turf(src.loc))
+	else
+		qdel_null(src.id)
+	qdel_null(src.cartridge)
+	qdel_null(src.pai)
+	return ..()
 
 /obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
 	if (istype(AM, /mob/living))

code/game/objects/items/devices/PDA/cart.dm

@@ -78,6 +78,10 @@ var/list/civilian_cartridges = list(
 	var/message2
 	var/list/stored_data = list()
 
+/obj/item/weapon/cartridge/Destroy()
+	qdel_null(radio)
+	return ..()
+
 /obj/item/weapon/cartridge/engineering
 	name = "\improper Power-ON cartridge"
 	icon_state = "cart-e"
@@ -164,10 +168,6 @@ var/list/civilian_cartridges = list(
     radio = new /obj/item/radio/integrated/signal(src)
     ..()
 
-/obj/item/weapon/cartridge/signal/Destroy()
-	qdel(radio)
-	..()
-
 /obj/item/weapon/cartridge/quartermaster
 	name = "\improper Space Parts & Space Vendors cartridge"
 	desc = "Perfect for the Quartermaster on the go!"

code/game/objects/items/devices/communicator/communicator.dm

@@ -803,7 +803,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	if(exonet)
 		exonet.remove_address()
 		exonet = null
-	..()
+	return ..()
 
 // Proc: update_icon()
 // Parameters: None

code/game/objects/items/devices/radio/intercom.dm

@@ -96,7 +96,7 @@
 
 /obj/item/device/radio/intercom/Destroy()
 	processing_objects -= src
-	..()
+	return ..()
 
 /obj/item/device/radio/intercom/attack_ai(mob/user as mob)
 	src.add_fingerprint(user)

code/game/objects/items/devices/transfer_valve.dm

@@ -169,7 +169,7 @@
 	
 	valve_open = 0
 	
-	if(deleted(tank_one) || deleted(tank_two))
+	if(QDELETED(tank_one) || QDELETED(tank_two))
 		return
 	
 	var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume

code/game/objects/items/weapons/flamethrower.dm

@@ -27,15 +27,10 @@
 
 
 /obj/item/weapon/flamethrower/Destroy()
-	if(weldtool)
-		qdel(weldtool)
-	if(igniter)
-		qdel(igniter)
-	if(ptank)
-		qdel(ptank)
-	..()
-	return
-
+	qdel_null(weldtool)
+	qdel_null(igniter)
+	qdel_null(ptank)
+	. = ..()
 
 /obj/item/weapon/flamethrower/process()
 	if(!lit)

code/game/objects/items/weapons/material/material_armor.dm

@@ -42,7 +42,7 @@ Protectiveness | Armor %
 
 /obj/item/clothing/Destroy()
 	processing_objects -= src
-	..()
+	return ..()
 
 /obj/item/clothing/get_material()
 	return material

code/game/objects/items/weapons/material/material_weapons.dm

@@ -71,7 +71,7 @@
 
 /obj/item/weapon/material/Destroy()
 	processing_objects -= src
-	..()
+	. = ..()
 
 /obj/item/weapon/material/apply_hit_effect()
 	..()

code/game/objects/items/weapons/mop_deploy.dm

@@ -26,7 +26,7 @@
 			T.dirt = 0
 		for(var/obj/effect/O in src)
 			if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
-				del(O)
+				qdel(O)
 /*	//Reagent code changed at some point and the below doesn't work.  To be fixed later.
 	source.reagents.reaction(src, TOUCH, 10)	//10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
 	source.reagents.remove_any(1)				//reaction() doesn't use up the reagents
@@ -47,16 +47,16 @@
 		return
 	..()
 
-/obj/item/weapon/mop_deploy/Del()
+/obj/item/weapon/mop_deploy/Destroy()
 	processing_objects -= src
-	..()
+	. = ..()
 
 /obj/item/weapon/mop_deploy/attack_self(mob/user as mob)
 	user.drop_from_inventory(src)
-	spawn(1) if(src) del(src)
+	spawn(1) if(!QDELETED(src)) qdel(src)
 
 /obj/item/weapon/mop_deploy/dropped()
-	spawn(1) if(src) del(src)
+	spawn(1) if(!QDELETED(src)) qdel(src)
 
 /obj/item/weapon/mop_deploy/process()
 	if(!creator || loc != creator || !creator.item_is_in_hands(src))
@@ -71,4 +71,4 @@
 			host.pinned -= src
 			host.embedded -= src
 			host.drop_from_inventory(src)
-		spawn(1) if(src) del(src)
+		spawn(1) if(!QDELETED(src)) qdel(src)

code/game/objects/items/weapons/storage/internal.dm

@@ -12,7 +12,7 @@
 
 /obj/item/weapon/storage/internal/Destroy()
 	master_item = null
-	..()
+	. = ..()
 
 /obj/item/weapon/storage/internal/attack_hand()
 	return		//make sure this is never picked up

code/game/objects/items/weapons/storage/storage.dm

@@ -38,15 +38,15 @@
 
 /obj/item/weapon/storage/Destroy()
 	close_all()
-	qdel(boxes)
-	qdel(src.storage_start)
-	qdel(src.storage_continue)
-	qdel(src.storage_end)
-	qdel(src.stored_start)
-	qdel(src.stored_continue)
-	qdel(src.stored_end)
-	qdel(closer)
-	..()
+	qdel_null(boxes)
+	qdel_null(src.storage_start)
+	qdel_null(src.storage_continue)
+	qdel_null(src.storage_end)
+	qdel_null(src.stored_start)
+	qdel_null(src.stored_continue)
+	qdel_null(src.stored_end)
+	qdel_null(closer)
+	. = ..()
 
 /obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
 	if(!canremove)

code/game/objects/items/weapons/tanks/tanks.dm

@@ -44,8 +44,7 @@ var/list/global/tank_gauge_cache = list()
 	return
 
 /obj/item/weapon/tank/Destroy()
-	if(air_contents)
-		qdel(air_contents)
+	qdel_null(air_contents)
 
 	processing_objects.Remove(src)
 
@@ -53,7 +52,7 @@ var/list/global/tank_gauge_cache = list()
 		var/obj/item/device/transfer_valve/TTV = loc
 		TTV.remove_tank(src)
 
-	..()
+	return ..()
 
 /obj/item/weapon/tank/examine(mob/user)
 	. = ..(user, 0)

code/game/objects/structures.dm

@@ -10,7 +10,7 @@
 /obj/structure/Destroy()
 	if(parts)
 		new parts(loc)
-	..()
+	. = ..()
 
 /obj/structure/attack_hand(mob/user)
 	if(breakable)
@@ -49,9 +49,6 @@
 	if(climbable)
 		verbs += /obj/structure/proc/climb_on
 
-/obj/structure/Destroy()
-	..()
-
 /obj/structure/proc/climb_on()
 
 	set name = "Climb structure"

code/game/objects/structures/lattice.dm

@@ -39,7 +39,7 @@
 		spawn(1)
 			if(istype(O)) // If we built a new floor with the lattice, the open turf won't exist anymore.
 				O.update() // This lattice may be supporting things on top of it.  If it's being deleted, they need to fall down.
-	..()
+	. = ..()
 
 /obj/structure/lattice/ex_act(severity)
 	switch(severity)

code/game/objects/structures/window.dm

@@ -355,12 +355,9 @@
 	density = 0
 	update_nearby_tiles()
 	var/turf/location = loc
-	loc = null
+	. = ..()
 	for(var/obj/structure/window/W in orange(location, 1))
 		W.update_icon()
-	loc = location
-	..()
-
 
 /obj/structure/window/Move()
 	var/ini_dir = dir