cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

some fixes for more stuff I broke

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2064 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
LastBattaWolf@hotmail.com
2011-08-29 05:24:28 +00:00
parent 1332e2e818
commit 228be07b7c
3 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/datums/spell.dm
View File

@@ -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()
..()

24
code/datums/spells/area_teleport.dm
View File

@@ -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
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

10
code/game/gamemodes/wizard/spells.dm
View File

@@ -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!")