Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2011-12-14 02:45:15 -05:00
3 changed files with 3532 additions and 3575 deletions
+1 -1
View File
@@ -462,7 +462,7 @@
return
/client/proc/playernotes()
set name = "Display Player Info"
set name = "Show Player Info"
set category = "Admin"
if(holder)
holder.PlayerNotes()
+1 -1
View File
@@ -320,7 +320,7 @@
playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better
sleep(50)
if ((user.loc == T && user.equipped() == W))
if ((user.loc == T && user.equipped() == W) && !dug)
user << "\blue You dug a hole."
gets_dug()
dug = 1
+3530 -3573
View File
File diff suppressed because it is too large Load Diff