Merge pull request #1473 from Fox-McCloud/destroyer

Destroy Pass III

code/game/objects/effects/effect_system.dm

@@ -40,11 +40,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	var/amount = 8.0
 
 /obj/effect/proc/delete()
-	loc = null
-	if(reagents)
-		reagents.my_atom = null
-		reagents.delete()
-	return
+	qdel(src)
 
 
 /obj/effect/effect/water/New()

code/game/objects/items.dm

@@ -52,17 +52,9 @@
 	var/list/species_fit = null //This object has a different appearance when worn by these species
 
 /obj/item/Destroy()
-	if(istype(src.loc, /mob))
-		var/mob/H = src.loc
-		H.unEquip(src) // items at the very least get unequipped from their mob before being deleted
-	if(reagents && istype(reagents))
-		reagents.my_atom = null
-		reagents.delete()
-	if(hasvar(src, "holder"))
-		src:holder = null
-	/*  BROKEN, FUCK BYOND
-	if(hasvar(src, "my_atom"))
-		src:my_atom = null*/
+	if(ismob(loc))
+		var/mob/m = loc
+		m.unEquip(src, 1)
 	return ..()
 
 /obj/item/device