From 799ed74a3cc462e398c2c17184aa1ae64e167663 Mon Sep 17 00:00:00 2001
From: Aranclanos <aranclanos@hotmail.com>
Date: Wed, 13 Mar 2013 00:08:20 -0300
Subject: [PATCH] Made the effects of EMP pulses get garbage collected. Less
 lag on the singularity (around 20 effect del per 5~10 seconds)

---
 code/game/machinery/bots/bots.dm                 | 2 +-
 code/game/machinery/bots/ed209bot.dm             | 2 +-
 code/game/machinery/machinery.dm                 | 2 +-
 code/game/objects/effects/effect_system.dm       | 2 +-
 code/game/objects/empulse.dm                     | 2 +-
 code/game/objects/items/devices/chameleonproj.dm | 4 ++--
 code/game/objects/items/tk_grab.dm               | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index 9862f63e2cc..8ef8c76f62c 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -143,7 +143,7 @@
 	pulse2.dir = pick(cardinal)
 
 	spawn(10)
-		del(pulse2)
+		pulse2.delete()
 	if (on)
 		turn_off()
 	spawn(severity*300)
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index 30aa8a4e64d..5e5ae744068 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -862,7 +862,7 @@ Auto Patrol: []"},
 		pulse2.anchored = 1
 		pulse2.dir = pick(cardinal)
 		spawn(10)
-			del(pulse2)
+			pulse2.delete()
 		var/list/mob/living/carbon/targets = new
 		for (var/mob/living/carbon/C in view(12,src))
 			if (C.stat==2)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index e94ed011eef..0e3e6ec650a 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -131,7 +131,7 @@ Class Procs:
 		pulse2.dir = pick(cardinal)
 
 		spawn(10)
-			del(pulse2)
+			pulse2.delete()
 	..()
 
 /obj/machinery/ex_act(severity)
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index c39b4812a04..56ce1b9e97b 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -30,7 +30,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	mouse_opacity = 0
 	var/amount = 8.0
 
-/obj/effect/effect/proc/delete()
+/obj/effect/proc/delete()
 	loc = null
 	return
 
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index 68cb8f2df3a..8bff463e445 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -15,7 +15,7 @@ proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
 		pulse.name = "emp pulse"
 		pulse.anchored = 1
 		spawn(20)
-			del(pulse)
+			pulse.delete()
 
 	if(heavy_range > light_range)
 		light_range = heavy_range
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 4a8ce4887c9..43d19213c88 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -40,7 +40,7 @@
 			var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
 			T.icon = 'icons/effects/effects.dmi'
 			flick("emppulse",T)
-			spawn(8) del(T)
+			spawn(8) T.delete()
 		else
 			playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
 			var/obj/O = new saved_item(src)
@@ -59,7 +59,7 @@
 			var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
 			T.icon = 'icons/effects/effects.dmi'
 			flick("emppulse",T)
-			spawn(8) del(T)
+			spawn(8) T.delete()
 
 	proc/disrupt()
 		if(active_dummy)
diff --git a/code/game/objects/items/tk_grab.dm b/code/game/objects/items/tk_grab.dm
index 11863e9ae2c..1839460d927 100644
--- a/code/game/objects/items/tk_grab.dm
+++ b/code/game/objects/items/tk_grab.dm
@@ -92,7 +92,7 @@
 		O.icon_state = "nothing"
 		flick("empdisable",O)
 		spawn(5)
-			del(O)
+			O.delete()
 		return