cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01: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
code/datums/spell.dm
+9 -9
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()
..()
code/datums/spells/area_teleport.dm
+12 -12
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