From 1aaee90154005f623ca0ba0d255be89faa448e01 Mon Sep 17 00:00:00 2001
From: "petethegoat@gmail.com"
 <petethegoat@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 11 Jan 2013 00:08:17 +0000
Subject: [PATCH] Updating the conjure spell to just use paths instead of
 strings.

Removed the needless Del() from event.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5512 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/spells/conjure.dm |  4 ++--
 code/datums/spells/wizard.dm  | 16 ++++++++--------
 code/modules/events/event.dm  | 10 +---------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index 7abd31fa38..233b60d31c 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -25,7 +25,7 @@
 		for(var/i=0,i<summon_amt,i++)
 			if(!targets.len)
 				break
-			var/summoned_object_type = text2path(pick(summon_type))
+			var/summoned_object_type = pick(summon_type)
 			var/spawn_place = pick(targets)
 			if(summon_ignore_prev_spawn_points)
 				targets -= spawn_place
@@ -58,7 +58,7 @@
 	name = "Dispense Wizard Justice"
 	desc = "This spell dispenses wizard justice."
 
-	summon_type = list("/obj/machinery/bot/ed209")
+	summon_type = list(/obj/machinery/bot/ed209)
 	summon_amt = 10
 	range = 3
 	newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")
\ No newline at end of file
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index 45046ca1c2..6e9db54b47 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -148,7 +148,7 @@
 	invocation_type = "shout"
 	range = 1
 
-	summon_type = list("/mob/living/simple_animal/hostile/carp")
+	summon_type = list(/mob/living/simple_animal/hostile/carp)
 
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/construct
@@ -162,7 +162,7 @@
 	invocation_type = "none"
 	range = 0
 
-	summon_type = list("/obj/structure/constructshell")
+	summon_type = list(/obj/structure/constructshell)
 
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/creature
@@ -177,7 +177,7 @@
 	summon_amt = 10
 	range = 3
 
-	summon_type = list("/mob/living/simple_animal/hostile/creature")
+	summon_type = list(/mob/living/simple_animal/hostile/creature)
 
 /obj/effect/proc_holder/spell/targeted/trigger/blind
 	name = "Blind"
@@ -252,7 +252,7 @@
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
-	summon_type = list("/turf/simulated/floor/engine/cult")
+	summon_type = list(/turf/simulated/floor/engine/cult)
 	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall
@@ -265,7 +265,7 @@
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
-	summon_type = list("/turf/simulated/wall/cult")
+	summon_type = list(/turf/simulated/wall/cult)
 	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
@@ -281,7 +281,7 @@
 	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 	delay = 50
 
-	summon_type = list("/turf/simulated/wall/r_wall")
+	summon_type = list(/turf/simulated/wall/r_wall)
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
 	name = "Summon Soulstone"
@@ -294,7 +294,7 @@
 	invocation_type = "none"
 	range = 0
 
-	summon_type = list("/obj/item/device/soulstone")
+	summon_type = list(/obj/item/device/soulstone)
 
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall
@@ -307,7 +307,7 @@
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
-	summon_type = list("/obj/effect/forcefield")
+	summon_type = list(/obj/effect/forcefield)
 	summon_lifespan = 50
 
 
diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm
index b6c64b89aa..6adf009ad6 100644
--- a/code/modules/events/event.dm
+++ b/code/modules/events/event.dm
@@ -71,12 +71,4 @@
 	events.Add(src)
 
 	if(oneShot)
-		potentialRandomEvents.Remove(type)
-
-
-//This shouldn't be called, but it ensures that the event doesn't persist in
-//the events list if it'd deleted instead of garbage collected with kill().
-//The master controller will also remove it from the events list if it
-//doesn't exist, so there's redundancy here.
-/datum/event/Del()
-    events.Remove(src)
\ No newline at end of file
+		potentialRandomEvents.Remove(type)
\ No newline at end of file