Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14

More qdel() changes

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

@@ -44,6 +44,23 @@
 	..()
 	processing_objects += src
 
+/obj/item/device/camera_bug/Destroy()
+	if(expansion)
+		qdel(expansion)
+		expansion = null
+	del(src)
+/* Easier to just call del() than this nonsense
+	get_cameras()
+	for(var/cam_tag in bugged_cameras)
+		var/obj/machinery/camera/camera = bugged_cameras[cam_tag]
+		if(camera.bug == src)
+			camera.bug = null
+	bugged_cameras = list()
+	if(tracking)
+		tracking = null
+	..()
+*/
+
 /obj/item/device/camera_bug/interact(var/mob/user = usr)
 	var/datum/browser/popup = new(user, "camerabug","Camera Bug",nref=src)
 	popup.set_content(menu(get_cameras()))

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -12,6 +12,10 @@
 	src.smoke = new /datum/effect/effect/system/bad_smoke_spread
 	src.smoke.attach(src)
 
+/obj/item/weapon/grenade/smokebomb/Destroy()
+	qdel(smoke)
+	..()
+
 /obj/item/weapon/grenade/smokebomb/prime()
 	update_mob()
 	playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)