From 228be07b7c19374bd58713c7ad7a57a32a6fab5f Mon Sep 17 00:00:00 2001
From: "LastBattaWolf@hotmail.com"
 <LastBattaWolf@hotmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 29 Aug 2011 05:24:28 +0000
Subject: [PATCH] some fixes for more stuff I broke

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2064 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/spell.dm                 | 18 +++++++++---------
 code/datums/spells/area_teleport.dm  | 24 ++++++++++++------------
 code/game/gamemodes/wizard/spells.dm | 10 +---------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index c624fe259e..b267cc140e 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -76,15 +76,15 @@ var/list/spells = typesof(/obj/proc_holder/spell) //needed for the badmin verb f
 
 /obj/proc_holder/spell/proc/invocation(mob/user = usr) //spelling the spell out and setting it on recharge/reducing charges amount
 
-//	switch(invocation_type)
-//		if("shout")
-//			usr.say(invocation)
-//			if(usr.gender=="male")
-//				playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
-//			else
-//				playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
-//		if("whisper")
-//			usr.whisper(invocation)
+	switch(invocation_type)
+		if("shout")
+			usr.say(invocation)
+			if(usr.gender=="male")
+				playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+			else
+				playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+		if("whisper")
+			usr.whisper(invocation)
 
 /obj/proc_holder/spell/New()
 	..()
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
index a9d6a43c2c..fba4af6b7c 100644
--- a/code/datums/spells/area_teleport.dm
+++ b/code/datums/spells/area_teleport.dm
@@ -49,15 +49,15 @@
 /obj/proc_holder/spell/targeted/area_teleport/invocation(area/chosenarea = null)
 	if(!invocation_area || !chosenarea)
 		..()
-//	else
-//		switch(invocation_type)
-//			if("shout")
-//				usr.say("[invocation] [uppertext(chosenarea.name)]")
-//				if(usr.gender=="male")
-//					playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
-//				else
-//					playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
-//			if("whisper")
-//				usr.whisper("[invocation] [uppertext(chosenarea.name)]")
-//
-//	return
\ No newline at end of file
+	else
+		switch(invocation_type)
+			if("shout")
+				usr.say("[invocation] [uppertext(chosenarea.name)]")
+				if(usr.gender=="male")
+					playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+				else
+					playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+			if("whisper")
+				usr.whisper("[invocation] [uppertext(chosenarea.name)]")
+
+	return
\ No newline at end of file
diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm
index 740e8481ec..7742a33595 100644
--- a/code/game/gamemodes/wizard/spells.dm
+++ b/code/game/gamemodes/wizard/spells.dm
@@ -20,7 +20,6 @@
 			usr.verbs += /client/proc/blind
 
 		usr.whisper("STI KALY")
-		playsound(usr.loc,'stikaly.ogg', 100,1)
 	//	usr.spellvoice()
 
 		var/obj/overlay/B = new /obj/overlay( M.loc )
@@ -54,7 +53,6 @@
 	if(!usr.casting()) return
 
 	usr.say("FORTI GY AMA")
-	playsound(usr.loc,'fortigyama.ogg', 100.1)
 	usr.spellvoice()
 
 	for (var/mob/living/M as mob in oview())
@@ -157,7 +155,6 @@
 	var/forcefield
 
 	usr.whisper("TARCOL MINTI ZHERI")
-	playsound(usr.loc,'tarcolminti.ogg', 100,1)
 //	usr.spellvoice()
 
 	forcefield =  new /obj/forcefield(locate(usr.x,usr.y,usr.z))
@@ -181,8 +178,7 @@
 		usr.verbs += /client/proc/fireball
 
 	usr.say("ONI SOMA")
-	playsound(usr.loc,'onisoma.ogg', 100,1)
-//	usr.spellvoice()
+	//	usr.spellvoice()
 
 	var/obj/overlay/A = new /obj/overlay( usr.loc )
 	A.icon_state = "fireball"
@@ -239,7 +235,6 @@
 		usr.verbs += /mob/proc/kill
 
 	usr.say("EI NATH")
-	playsound('einath.ogg')
 	usr.spellvoice()
 
 	var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
@@ -263,7 +258,6 @@
 		usr.verbs += /mob/proc/tech
 
 	usr.say("NEC CANTIO")
-	playsound(usr.loc,'neccantio.ogg', 100,1)
 	usr.spellvoice()
 	empulse(src, 6, 10)
 	return
@@ -327,7 +321,6 @@
 	var/area/thearea = teleportlocs[A]
 
 	usr.say("SCYAR NILA [uppertext(A)]")
-	playsound(usr.loc,'scyarnila.ogg', 100,1)
 	usr.spellvoice()
 
 	var/datum/effects/system/harmless_smoke_spread/smoke = new /datum/effects/system/harmless_smoke_spread()
@@ -482,7 +475,6 @@
 		usr.verbs += /client/proc/mutate
 
 	usr.say("BIRUZ BENNAR")
-	playsound(usr.loc,'brucebanner.ogg', 100,1)
 	usr.spellvoice()
 
 	usr << text("\blue You feel strong! Your mind expands!")