This is patch08 to PennMUSH 1.8.1. After applying this patch, you will
have version 1.8.1p8

To apply this patch, save it to a file in your top-level MUSH directory,
and do the following:
	patch -p1 < 1.8.1-patch08
	make clean
	make install

If you use GNU patch 2.2, you probably want the above to be 'patch -b -p1',
not just 'patch -p1'.

Unix (or cygwin) users need not worry about failed hunks in src/switchinc.c,
hdrs/switches.h, hdrs/cmds.h, or hdrs/funs.h. These files are automatically
rebuilt on compile. On the off chance they appear not to be, simply
rm them and re-run make.

Then @shutdown and restart your MUSH.
    - Alan/Javelin

In this patch:

Attributes:
  * New 'AAHEAR' and 'AMHEAR' attribute flags, when set on an
    ^listen attribute, cause it to behave like @aahear or
    @amhear respectively, instead of like @ahear. Suggested by
    Jules@M*U*S*H. Patch by Talvo@M*U*S*H.
  * New UNIMPLEMENTED_COMMAND command handles commands that
    are known but not implemented (currently just @SQL). By default,
    produces a standard message, but can now be @hooked, etc.
    Suggested by Talvo@M*U*S*H. [TAP].
  * @conformat and @invformat are now passed a |-delimited list
    of object names, unparsed in the default fashion, as %1. Patch
    by Talvo@M*U*S*H.
Functions:
  * default() can now take any number of obj/attr cases. Suggested
    by Nathan Baum, patch by Talvo@M*U*S*H.
  * lwhoid(), mwhoid(), xwhoid(), xmwhoid() work like lwho(), etc.
    but return objids instead of dbrefs. Patch by Talvo@M*U*S*H.
  * stringsecs() converts timestrings to seconds. Patch by Talvo@M*U*S*H.
Minor changes:
  * %u is now set to the evaluated typed $command (when a $command
    is matched) and is available to locks. Suggested
    by Jules@M*U*S*H, patch by Talvo@M*U*S*H.
  * Rooms reachable from FLOATING rooms are now considered topologically
    connected, just like rooms reachable from the base room.
    Patch by Nathan Baum.
  * %i0-%i9 evaluates to itext(0)-itext(9) for convenience in iter(). 
    Suggested by Nathan Baum. Patch by Talvo@M*U*S*H.
  * When safer_ufun is on, you must control an object to @function
    an attribute on it. This prevents, e.g., mortals with @function power
    from making attributes on wizard objects into @functions. 
    Suggested by Talvo@M*U*S*H.
  * Internal eval_lock_with function added to support passing special
    %0/%1 values to lock evaluations. Suggested by Malix@8bit.
  * Improved @uptime display by Ambrosia@M*U*S*H.
  * Players may @search a ZMP if they pass the zone lock. Patch by
    Talvo@M*U*S*H.
Fixes:
  * cbuffer() crash fixed. Report by qa'toq@ST:Foundations. [GM]
  * regex crash bug fixed. [GM]
  * insert() added an extra delimiter when inserting at end of list.
    Report by Sangman. [SW]
  * make distclean is more thorough. Patch by Ranmir@M*U*S*H.
  * EQSPLIT commands with no equal sign that were hooked were passed to the 
    hook attribute with an equal sign (and nothing to the right).
    Fixed. Suggested by Talvo@M*U*S*H.
  * zwho/zmwho can now be used by see_all players on any zone.
    Suggested by Talvo@M*U*S*H.
  * crecall() now accepts 1 or 2 arguments, as promised. Report by
    Sketch@M*U*S*H.
  * attrib_set(obj/attr,) sets the attribute to a single space
    when EMPTY_ATTRS is off. Patch by Talvo@M*U*S*H.
  * Portability fix in fun_speak. [EEH]
  * Fix to TZ parsing in src/funtime.c by Jules@M*U*S*H.
  * Fix to speak() for fragments of speech by Talvo@M*U*S*H based on
    report by Trelane@M*U*S*H.
  * Typo fixes in game/aliascnf.dst by Talvo@M*U*S*H.
  * Help fixes by Talvo@M*U*S*H, Sketch@M*U*S*H.


Prereq: 1.8.1p7
*** 1_8_1.311/Patchlevel Fri, 31 Mar 2006 19:32:21 -0600 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.51 600)
--- 1_8_1.336(w)/Patchlevel Sun, 11 Jun 2006 07:27:12 -0500 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.52 600)
***************
*** 1,2 ****
  Do not edit this file. It is maintained by the official PennMUSH patches.
! This is PennMUSH 1.8.1p7
--- 1,2 ----
  Do not edit this file. It is maintained by the official PennMUSH patches.
! This is PennMUSH 1.8.1p8
*** 1_8_1.311/game/txt/hlp/penntop.hlp Mon, 10 Apr 2006 12:15:53 -0500 dunemush (pennmush/13_penntop.hl 1.2.1.27.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.12.1.1.1.1.1.8.1.11.1.1.1.3.2.1.1.1.1.1.1.1.1.1.1.1.1.3 600)
--- 1_8_1.336(w)/game/txt/hlp/penntop.hlp Sat, 03 Jun 2006 20:44:11 -0500 dunemush (pennmush/13_penntop.hl 1.2.1.27.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.12.1.1.1.1.1.8.1.11.1.1.1.3.2.1.1.1.1.1.1.1.1.1.1.1.1.7 600)
***************
*** 225,231 ****
    The following functions support anonymous attributes:
    
    filter()    filterbool()   fold()      foreach()   map()
!   mix()       munge()        sortby()    step() 
  & ATTRIB-OWNERSHIP
    ATTRIBUTE OWNERSHIP
    
--- 225,231 ----
    The following functions support anonymous attributes:
    
    filter()    filterbool()   fold()      foreach()   map()
!   mix()       munge()        sortby()    sortkey()   step()
  & ATTRIB-OWNERSHIP
    ATTRIBUTE OWNERSHIP
    
***************
*** 551,559 ****
    order of possible commands:
  
      Special game commands: WHO, QUIT, etc.
!     Single-token commands: ", :, ;, +
      Exits in the room
!     @-commands
      Regular game commands: get, inventory, etc.
      Enter aliases
      Leave aliases
--- 551,559 ----
    order of possible commands:
  
      Special game commands: WHO, QUIT, etc.
!     Single-token commands: ", :, ;, +, \, #
      Exits in the room
!     @-commands and &attribute setting
      Regular game commands: get, inventory, etc.
      Enter aliases
      Leave aliases
***************
*** 804,813 ****
  
  (continued in help listening3)
  & LISTENING3
!   Please note that an object CANNOT trigger its own ^-patterns, so they
!   work like @ahear rather than @aahear or @amhear. (Note that the
!   triggering object is whatever happens to be %#, so, for example, when
!   you @set an object MONITOR, you are %# with regard to the 
    "Object is now listening" message, and this message can be picked up
    with an ^pattern.)
  
--- 804,814 ----
  
  (continued in help listening3)
  & LISTENING3
!   By default, ^-patterns work like @ahear. To have them work like
!   @amhear, set the AMHEAR attribute flag on the attribute; to have
!   them work like @aahear, set the AAHEAR attribute flag on the attribute
!   (Note that the triggering object is whatever happens to be %#, so, for
!   example, when you @set an object MONITOR, you are %# with regard to the
    "Object is now listening" message, and this message can be picked up
    with an ^pattern.)
  
***************
*** 1620,1625 ****
--- 1621,1627 ----
       %! = the dbref number of the object the command is on.
       %L = the dbref of the ENACTOR's location.
       %c = text of the last command, _before_ evaluation.
+      %u = text of the last $command, after evaluation, available to locks.
       %? = The current function invocation and depth counts.
       %+ = The number of arguments passed to the current ufun.
      %qN = the equivalent of r(N), a register set by a setq() function.
*** 1_8_1.311/game/txt/hlp/pennfunc.hlp Mon, 10 Apr 2006 12:15:53 -0500 dunemush (pennmush/16_pennfunc.h 1.2.1.50.1.1.1.1.1.2.1.7.1.8.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.26.1.1.1.1.1.1.1.23.1.2.1.10 600)
--- 1_8_1.336(w)/game/txt/hlp/pennfunc.hlp Sun, 04 Jun 2006 09:51:16 -0500 dunemush (pennmush/16_pennfunc.h 1.2.1.50.1.1.1.1.1.2.1.7.1.8.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.26.1.1.1.1.1.1.1.23.1.2.1.16 600)
***************
*** 109,117 ****
  
    cmds()        conn()        doing()       height()      hostname()
    hidden()      idle()        ipaddr()      lports()      lwho()        
!   mwho()        nmwho()       nwho()        ports()       pueblo()      
!   recv()        sent()        ssl()         terminfo()    width()       
!   xmwho()       xwho()        zmwho()       zwho()
  & Dbref functions
    Dbref functions return a dbref or list of dbrefs related to some value
    on an object.
--- 109,118 ----
  
    cmds()        conn()        doing()       height()      hostname()
    hidden()      idle()        ipaddr()      lports()      lwho()        
!   lwhoid()      mwho()        mwhoid()      nmwho()       nwho()
!   ports()       pueblo()      recv()        sent()        ssl()         
!   terminfo()    width()       xmwho()       xmwhoid()     xwho()        
!   xwhoid()      zmwho()       zwho()
  & Dbref functions
    Dbref functions return a dbref or list of dbrefs related to some value
    on an object.
***************
*** 214,220 ****
    
    convsecs()    convutcsecs() convtime()    ctime()       etimefmt()
    isdaylight()  mtime()       restarttime() secs()        starttime()
!   time()        timefmt()     timestring()  utctime()   
  
  & Utility functions
    These functions don't quite fit into any other category.
--- 215,221 ----
    
    convsecs()    convutcsecs() convtime()    ctime()       etimefmt()
    isdaylight()  mtime()       restarttime() secs()        starttime()
!   stringsecs()  time()        timefmt()     timestring()  utctime()   
  
  & Utility functions
    These functions don't quite fit into any other category.
***************
*** 887,901 ****
    the string and the same password.
  
  & DEFAULT()
!   Function:  default([<obj>/]<attr>,<default case>)
!  
!   This function returns the value of <obj>/<attr>, as if retrieved via
!   the get() function, if the attribute exists and is readable by you.
!   Otherwise, it evaluates the default case, and returns that.
!   Note that the default case is only evaluated if the attribute does
!   not exist or cannot be read. Note further than an empty attribute
!   counts as an existing attribute.
   
    This is useful for code that needs to return the value of an attribute,
    or an error message or default case, if that attribute does not exist.
   
--- 888,902 ----
    the string and the same password.
  
  & DEFAULT()
!   Function:  default([<obj>/]<attr>,[[<obj>]/<attr>,..]<default case>)
   
+   This function returns the value of the first possible <obj>/<attr>,
+   as if retrieved via the get() function, if the attribute exists and
+   is readable by you.  Otherwise, it evaluates the default case, and
+   returns that.  Note that the default case is only evaluated if the
+   attribute does not exist or cannot be read. Note further than an empty
+   attribute counts as an existing attribute.
+ 
    This is useful for code that needs to return the value of an attribute,
    or an error message or default case, if that attribute does not exist.
   
***************
*** 1813,1828 ****
  & ILEV()
  & ITEXT()
  & INUM()
    ilev()
    itext(<n>)
    inum(<n>)
  
    These functions, when called within an iter(), return the equivalent
    of ## (itext) or #@ (inum), with reference to the nth more outermost
    iter(), where n=0 refers to the current iter(), n=1 to an iter()
!   in which the current iter() is nested, etc. ilev() will return the
!   current nesting depth, or -1 if it is outside an iter(). Thus,
!   itext(ilev()) will return the ## of the outermost iter().
  
    > say [iter(red blue green,iter(fish shoe, #@:##))]
    You say, "1:red 1:red 2:blue 2:blue 3:green 3:green"
--- 1814,1832 ----
  & ILEV()
  & ITEXT()
  & INUM()
+ & %i
    ilev()
    itext(<n>)
+   %i<n>
    inum(<n>)
  
    These functions, when called within an iter(), return the equivalent
    of ## (itext) or #@ (inum), with reference to the nth more outermost
    iter(), where n=0 refers to the current iter(), n=1 to an iter()
!   in which the current iter() is nested, etc. %iX is shorthand for itext(X)
!   (up to itext(9).  ilev() returns the current nesting depth, or -1
!   if it is outside an iter().  Thus, itext(ilev()) will return the ##
!   of the outermost iter().
  
    > say [iter(red blue green,iter(fish shoe, #@:##))]
    You say, "1:red 1:red 2:blue 2:blue 3:green 3:green"
***************
*** 1833,1839 ****
    > say [iter(red blue green,iter(fish shoe, [inum(0)]:[itext(0)]))]
    You say, "1:fish 2:shoe 1:fish 2:shoe 1:fish 2:shoe"
    
!   > say [iter(red blue green,iter(fish shoe, [itext(1)]:[itext(0)]))]
    You say, "red:fish red:shoe blue:fish blue:shoe green:fish green:shoe"
  & IPADDR()
    ipaddr(<player|descriptor>)
--- 1837,1843 ----
    > say [iter(red blue green,iter(fish shoe, [inum(0)]:[itext(0)]))]
    You say, "1:fish 2:shoe 1:fish 2:shoe 1:fish 2:shoe"
    
!   > say [iter(red blue green,iter(fish shoe, %i1:%i0))]
    You say, "red:fish red:shoe blue:fish blue:shoe green:fish green:shoe"
  & IPADDR()
    ipaddr(<player|descriptor>)
***************
*** 2304,2313 ****
    This function returns the dbrefs of all non-dark things inside an
    object. You must be in the object or control it to use this function.
  & LWHO()
    lwho()
    lwho(<viewer>)
  
!   This returns a list of the dbref numbers for all currently-connected
    players. When mortals use this function, the dbref numbers of DARK
    wizards or royalty do NOT appear on the dbref list.
  
--- 2308,2319 ----
    This function returns the dbrefs of all non-dark things inside an
    object. You must be in the object or control it to use this function.
  & LWHO()
+ & LWHOID()
    lwho()
    lwho(<viewer>)
+   lwhoid(<viewer>)
  
!   lwho() returns a list of the dbref numbers for all currently-connected
    players. When mortals use this function, the dbref numbers of DARK
    wizards or royalty do NOT appear on the dbref list.
  
***************
*** 2315,2320 ****
--- 2321,2328 ----
    DARK and Hidden players, lwho() returns the output of lwho() from
    <viewer>'s point of view.
  
+   lwohid() returns a list of objid's instead.
+ 
    See also: mwho(), nwho(), xwho()
  & MAP()
    map([<object>/]<attribute>,<list>[,<delim>][, <osep>])
***************
*** 2574,2585 ****
  
    See also: anonymous attributes
  & MWHO()
    mwho()
  
!   This returns a list of the dbref numbers for all current-connected,
    non-hidden players. It's exactly the same as lwho() used by a
    mortal, and is suitable for use on privileged global objects who
    need an unprivileged who-list.
  & ALIAS()
    alias(<player>[,<new alias>])
  
--- 2582,2597 ----
  
    See also: anonymous attributes
  & MWHO()
+ & MWHOID()
    mwho()
+   mwhoid()
  
!   mwho() returns a list of the dbref numbers for all current-connected,
    non-hidden players. It's exactly the same as lwho() used by a
    mortal, and is suitable for use on privileged global objects who
    need an unprivileged who-list.
+   
+   mwhoid() returns a list of objids instead.
  & ALIAS()
    alias(<player>[,<new alias>])
  
***************
*** 3588,3594 ****
    "<speech>          <speaker's name> says, "<speech>"
    <speech>           <speaker's name> says, "<speech>"
   
-   The conf parameter say_uses_comma is respected (using "says," or "says").
    If <say string> is specified, it is used instead of "says," / "says".
  
    Continued in 'help Speak2'.
--- 3600,3605 ----
***************
*** 4250,4255 ****
--- 4261,4278 ----
    > say [timestring(301,2)]
    You say, "00d 00h 05m 01s"
  
+   See also: stringsecs()
+ & STRINGSECS()
+   stringsecs(<timestring>)
+ 
+   The stringsecs() function takes a string of the form produced by
+   timestring() and converts it back into seconds.
+ 
+   Example:
+   > say [stringsecs(5m 1s)]
+   You say, "301"
+ 
+   See also: timestring(), etimefmt()
  & TR()
    tr(<string>,<find>,<replace>)
  
***************
*** 4774,4782 ****
--- 4797,4809 ----
  
    See also: nthings(), lthings(), lvthings()
  & XWHO()
+ & XWHOID()
  & XMWHO()
+ & XMWHOID()
    xwho(start,count)
    xmwho(start,count)
+   xwhoid(start,count)
+   xmwhoid(start,count)
  
    xwho() fetches <count> or fewer player dbrefs from the list of connected
    players. It is useful when the number of players connected causes lwho()
***************
*** 4787,4792 ****
--- 4814,4821 ----
    xmwho() is identical, except it is limited to non-DARK and non-HIDE
    players.
  
+   xwhoid() and xmwhoid() return objids instead of dbrefs.
+ 
    See also: lwho(), mwho(), nwho()
  
  & ZMWHO()
***************
*** 4796,4801 ****
--- 4825,4832 ----
    non-hidden players within a location belonging to the specified zone.
    It's exactly the same as zwho() used by a mortal, and is suitable for
    use on privileged global objects who need an unprivileged zwho-list.
+   The viewer must either have see_alll privileges or pass the zone
+   lock of the zone to use the function.
  
    See also: zwho()
  
***************
*** 4805,4811 ****
    This returns a list of the dbref numbers for all currently-connected
    players within a location belonging to the specified zone. When mortals
    use this function, the dbref numbers of DARK wizards or hidden royalty
!   do NOT appear on the dbref list.
    
    If <viewer> is given by a privileged user, zwho() returns a dbref list
    using <viewer>'s privileges.
--- 4836,4843 ----
    This returns a list of the dbref numbers for all currently-connected
    players within a location belonging to the specified zone. When mortals
    use this function, the dbref numbers of DARK wizards or hidden royalty
!   do NOT appear on the dbref list. The viewer must either have see_all
!   privileges or pass the zone lock of the zone to use the function.
    
    If <viewer> is given by a privileged user, zwho() returns a dbref list
    using <viewer>'s privileges.
*** 1_8_1.311/game/txt/hlp/penncmd.hlp Sat, 25 Mar 2006 14:30:07 -0600 dunemush (pennmush/18_penncmd.hl 1.2.1.1.1.47.1.1.1.1.1.3.1.4.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.10.1.1.1.1.1.1.1.1.1.1.1.47.1.1.1.1.1.1.1.6 600)
--- 1_8_1.336(w)/game/txt/hlp/penncmd.hlp Sat, 03 Jun 2006 17:05:23 -0500 dunemush (pennmush/18_penncmd.hl 1.2.1.1.1.47.1.1.1.1.1.3.1.4.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.10.1.1.1.1.1.1.1.1.1.1.1.47.1.1.1.1.1.1.1.10 600)
***************
*** 397,403 ****
  
    @attribute/access adds a new standard attribute into the table,
    associating it with the given space-separated list of full flag names.
!   See 'help @set' for possible flags. A flag list of "none" removes
    all flag associations.
    If the /retroactive switch is added, the flags are assigned to every copy
    of the attribute that already exists in the database.
--- 397,403 ----
  
    @attribute/access adds a new standard attribute into the table,
    associating it with the given space-separated list of full flag names.
!   See 'help attribute flags' for possible flags. A flag list of "none" removes
    all flag associations.
    If the /retroactive switch is added, the flags are assigned to every copy
    of the attribute that already exists in the database.
***************
*** 611,617 ****
    with @command/add. These switches are:
  
    /noparse   : The command does not evaluate arguments passed to it.
!   /eqsplit   : The parser parses leftside and rightside
    /lsargs    : Comma-separated arguments on the left side are parsed.
    /rsargs    : In conjunction with eqsplit, the right-side arguments,
                 comma-separated, are parsed individually and passed
--- 611,617 ----
    with @command/add. These switches are:
  
    /noparse   : The command does not evaluate arguments passed to it.
!   /eqsplit   : The parser parses leftside and rightside around =
    /lsargs    : Comma-separated arguments on the left side are parsed.
    /rsargs    : In conjunction with eqsplit, the right-side arguments,
                 comma-separated, are parsed individually and passed
***************
*** 680,685 ****
--- 680,687 ----
    as if it were a description or other similar message on the room.
    The objects that the looker would normally be able to see is passed
    as a dbref list in %0; all contents can be acquired through 'lcon(me)'.
+   A |-delimited list of all the unparsed object names is passed 
+   in %1 (so iter(%1,itext(0),|,%r) produces the standard list)
   
    One could change the format to 'Contents: Object1 Object2 Object3'
    through '@conformat here = Contents: [iter(%0,name(##))]',
***************
*** 693,698 ****
--- 695,702 ----
    "inventory" command, by a player-specified format. This is evaluated
    as if it were a description or other similar message on the object.
    The objects carried are passed as a dbref list in %0.
+   A |-delimited list of all the unparsed object names is passed 
+   in %1 (so iter(%1,itext(0),|,%r) produces the standard list)
  
    One could change the format to 'You've got: Object1 Object2 Object3'
    through '@invformat me = You've got: [iter(%0,name(##))]',
***************
*** 1152,1181 ****
    See also @pemit, @remit, @oemit, @lemit, NOSPOOF and SPOOFING.
  & @enable
  & @disable
!   @enable <parameter>
!   @disable <parameter>
!   
!   These are wizard commands that allow certain parameters of the game to
!   be changed at runtime. The values of these parameters are listed by the
!   "@config" command. Common parameters and their effects are as follows:
!   
!   logins       --  When logins are disabled, only wizards and royalty may
!                    log into the game. Mortals attempting to log in will be
!                    given the down text, as well as the @rejectmotd.
!   guests       --  When guests are disabled, players can not log in as
!                    guest characters.
!   pueblo       --  Turns on HTML output for the Pueblo client.
!   log_commands --  When this is enabled, all commands are logged.
!   log_huhs     --  When this is enabled, all commands that produce a "Huh?"
!                    are logged.
!   log_forces   --  When this is enabled, @forces done by wizards are logged.
!   log_walls    --  When this is enabled, @walls are logged.
  
!   Actually, any boolean (Yes/No) runtime option can be enabled or
!   disabled with these commands, as a shortcut for @config/set.
  
    @enable <option> is the same thing as @config/set <option>=yes
    @disable <option> is the same thing as @config/set <option>=no
  & @zenter
  & @ozenter
  & @azenter
--- 1156,1171 ----
    See also @pemit, @remit, @oemit, @lemit, NOSPOOF and SPOOFING.
  & @enable
  & @disable
!   @enable <option>
!   @disable <option>
  
!   These wizard-only commands allow for any boolean @config options to
!   be changed (see "help @config paramaters" for a list).
  
    @enable <option> is the same thing as @config/set <option>=yes
    @disable <option> is the same thing as @config/set <option>=no
+ 
+   See also: @config
  & @zenter
  & @ozenter
  & @azenter
***************
*** 1521,1527 ****
  (continued in help @function2)
  & @function2
    <object> can be anything that the player using the @function command
!   controls. <function name> must be 30 characters or less. 
  
    A function defined using @function works just like any of the normal
    MUSH functions, from the user's perspective. The functions are
--- 1511,1518 ----
  (continued in help @function2)
  & @function2
    <object> can be anything that the player using the @function command
!   controls (if safer_ufun is enabled) or can examine (if not). 
!   <function name> must be 30 characters or less. 
  
    A function defined using @function works just like any of the normal
    MUSH functions, from the user's perspective. The functions are
***************
*** 2980,2987 ****
    If <class>=COUNT, then @search will only return up to <restriction> results.
  
    For the class TYPE=PLAYER, and for  PLAYER=<player-name>, anyone may
!   obtain information on any player.  In all other cases, only wizards may
!   obtain information about other players. This is computationally
    expensive, costing 100 pennies. It is generally faster than @find.
    
    Examples:  
--- 2971,2979 ----
    If <class>=COUNT, then @search will only return up to <restriction> results.
  
    For the class TYPE=PLAYER, and for  PLAYER=<player-name>, anyone may
!   obtain information on any player.  In all other cases, wizards may
!   obtain information about other players, and players who pass a ZMP's
!   zone-lock may obtain information about the ZMP. This is computationally
    expensive, costing 100 pennies. It is generally faster than @find.
    
    Examples:  
***************
*** 3073,3078 ****
--- 3065,3075 ----
                      retrieved if you're co-located with the object.
    public (p)        This attribute can be evaluated by any object, even
                      if safer_ufun is in use. DANGEROUS! AVOID!
+   aahear (A)        ^-listens on this attribute match like @aahear
+   amhear (M)        ^-listens on this attribute match like @amhear
+ 
+   Continued in 'help attribute flags3'
+ & attribute flags3
    prefixmatch       When a user attempts to set an attribute using @<attrib>,
                      this attribute will be matched down to its unique
                      prefixes. This flag is primarily used internally.
***************
*** 3096,3103 ****
  & @shutdown
    @shutdown[/panic][/reboot][/paranoid]
  
!   @shutdown shuts down the game. It may only be used by Wizards and
!   must be typed in full.
  
    @shutdown/panic performs a panic shutdown of the game, using a seperate
    database file, not the normal one. It may only be used by God.
--- 3093,3099 ----
  & @shutdown
    @shutdown[/panic][/reboot][/paranoid]
  
!   @shutdown shuts down the game. It may only be used by Wizards.
  
    @shutdown/panic performs a panic shutdown of the game, using a seperate
    database file, not the normal one. It may only be used by God.
*** 1_8_1.311/game/txt/hlp/pennchat.hlp Sat, 25 Mar 2006 13:53:00 -0600 dunemush (pennmush/19_pennchat.h 1.2.1.4.1.16 600)
--- 1_8_1.336(w)/game/txt/hlp/pennchat.hlp Sat, 03 Jun 2006 16:36:31 -0500 dunemush (pennmush/19_pennchat.h 1.2.1.4.1.17 600)
***************
*** 286,291 ****
--- 286,292 ----
    If the third argument is a true value, the channel name will be
    prepended to the message, behaving like @cemit/noisy.
  & CFLAGS()
+ & CLFLAGS()
    cflags(<channel>)
    cflags(<channel>,<object>)
    clflags(<channel>)
***************
*** 347,351 ****
    Channel functions work with the channel system.
  
    cbuffer()     cdesc()       cemit()       cflags()      channels()    
!   clflags()     clock()       cmsgs()       cowner()      cstatus()     
!   ctitle()      cusers()      cwho()
--- 348,352 ----
    Channel functions work with the channel system.
  
    cbuffer()     cdesc()       cemit()       cflags()      channels()    
!   clflags()     clock()       cmsgs()       cowner()      crecall()
!   cstatus()     ctitle()      cusers()      cwho()
*** 1_8_1.311/game/mushcnf.dst Sat, 25 Mar 2006 15:34:13 -0600 dunemush (pennmush/41_mushcnf.ds 1.1.1.19.1.1.1.2.1.1.1.8.1.1.1.1.1.34.1.1.1.2 600)
--- 1_8_1.336(w)/game/mushcnf.dst Sat, 03 Jun 2006 17:12:55 -0500 dunemush (pennmush/41_mushcnf.ds 1.1.1.19.1.1.1.2.1.1.1.8.1.1.1.1.1.34.1.1.1.3 600)
***************
*** 84,90 ****
  player_start 0
  
  # The master room. Exits here are global, as are commands on
! # objects here. This only is used if globals is set to "yes".
  master_room 2
  
  # The base room. Any room that can be reached from this room
--- 84,90 ----
  player_start 0
  
  # The master room. Exits here are global, as are commands on
! # objects here.
  master_room 2
  
  # The base room. Any room that can be reached from this room
*** 1_8_1.311/src/wiz.c Tue, 21 Mar 2006 20:44:22 -0600 dunemush (pennmush/b/23_wiz.c 1.44.1.1.1.1.1.2.1.7.1.1.1.1.1.1.1.1.1.1.1.8.1.2.2.2.1.2.1.1.1.1.1.1.1.2.1.1.1.2.2.17.1.9.1.30.1.3.1.2.1.1.1.4.1.1.1.1.1.8 660)
--- 1_8_1.336(w)/src/wiz.c Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/b/23_wiz.c 1.44.1.1.1.1.1.2.1.7.1.1.1.1.1.1.1.1.1.1.1.8.1.2.2.2.1.2.1.1.1.1.1.1.1.2.1.1.1.2.2.17.1.9.1.30.1.3.1.2.1.1.1.4.1.1.1.1.1.10 660)
***************
*** 374,382 ****
       * treat a 'home' command 
       */
      if (player == victim) {
!       if (Fixed(victim))
! 	notify(player, T("You can't do that IC!"));
!       else
  	safe_tel(victim, HOME, silent);
        return;
      } else
--- 374,380 ----
       * treat a 'home' command 
       */
      if (player == victim) {
!       if (command_check_byname(victim, "HOME"))
  	safe_tel(victim, HOME, silent);
        return;
      } else
***************
*** 2027,2033 ****
    is_wiz = Search_All(player) || See_All(player);
  
    if ((spec.owner != ANY_OWNER && spec.owner != Owner(player)) &&
!       !(is_wiz || (spec.type == TYPE_PLAYER))) {
      giveto(player, FIND_COST);
      notify(player, T("You need a search warrant to do that."));
      return -1;
--- 2025,2032 ----
    is_wiz = Search_All(player) || See_All(player);
  
    if ((spec.owner != ANY_OWNER && spec.owner != Owner(player)) &&
!       !(is_wiz || (spec.type == TYPE_PLAYER) ||
! 	(ZMaster(spec.owner) && eval_lock(player, spec.owner, Zone_Lock)))) {
      giveto(player, FIND_COST);
      notify(player, T("You need a search warrant to do that."));
      return -1;
*** 1_8_1.311/src/parse.c Tue, 31 Jan 2006 21:11:52 -0600 dunemush (pennmush/b/48_parse.c 1.23.1.10.1.2.1.1.1.1.1.2.1.2.1.41.1.8 660)
--- 1_8_1.336(w)/src/parse.c Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/b/48_parse.c 1.23.1.10.1.2.1.1.1.1.1.2.1.2.1.41.1.8.1.6 660)
***************
*** 35,40 ****
--- 35,41 ----
  
  extern char *absp[], *obj[], *poss[], *subj[];	/* fundb.c */
  extern int inum, inum_limit;
+ extern char *iter_rep[];
  int global_fun_invocations;
  int global_fun_recursions;
  /* extern int re_subpatterns; */
***************
*** 454,459 ****
--- 455,461 ----
    char *debugstr = NULL, *sourcestr = NULL;
    char *realbuff = NULL, *realbp = NULL;
    int gender = -1;
+   int inum_this;
    char *startpos = *bp;
    int had_space = 0;
    char temp[3];
***************
*** 643,678 ****
        break;
      case '$':			/* Dollar subs for regedit() */
        if ((eflags & (PE_DOLLAR | PE_EVALUATE)) == (PE_DOLLAR | PE_EVALUATE) &&
! 	  global_eval_context.re_subpatterns >= 0) {
  	char obuf[BUFFER_LEN];
! 	int p = 0;
  	char subspace[BUFFER_LEN];
  	char *named_substring = NULL;
  
  	obuf[0] = '\0';
  	(*str)++;
! 	/* Check the first two characters after the $ for a number */
  	if (isdigit((unsigned char) **str)) {
  	  p = **str - '0';
  	  (*str)++;
- 	  if (isdigit((unsigned char) **str)) {
- 	    p *= 10;
- 	    p += **str - '0';
- 	    (*str)++;
- 	    if (isdigit((unsigned char) **str)) {
- 	      /* More than 100. Treat this as literal. */
- 	      safe_chr('$', buff, bp);
- 	      safe_number(p, buff, bp);
- 	    }
- 	  }
- 	  /* Look for a named subexpression */
  	} else if (**str == '<') {
  	  char *nbuf = subspace;
  	  (*str)++;
! 	  for (; *str && **str != '>'; (*str)++)
  	    safe_chr(**str, subspace, &nbuf);
  	  *nbuf = '\0';
! 	  if (*str)
  	    (*str)++;
  	  if (is_strict_integer(subspace))
  	    p = abs(parse_integer(subspace));
--- 645,672 ----
        break;
      case '$':			/* Dollar subs for regedit() */
        if ((eflags & (PE_DOLLAR | PE_EVALUATE)) == (PE_DOLLAR | PE_EVALUATE) &&
! 	  global_eval_context.re_subpatterns >= 0 &&
! 	  global_eval_context.re_offsets != NULL &&
! 	  global_eval_context.re_from != NULL) {
  	char obuf[BUFFER_LEN];
! 	int p = -1;
  	char subspace[BUFFER_LEN];
  	char *named_substring = NULL;
  
  	obuf[0] = '\0';
  	(*str)++;
! 	/* Check the first character after the $ for a number */
  	if (isdigit((unsigned char) **str)) {
  	  p = **str - '0';
  	  (*str)++;
  	} else if (**str == '<') {
+ 	  /* Look for a named or numbered subexpression */
  	  char *nbuf = subspace;
  	  (*str)++;
! 	  for (; *str && **str && **str != '>'; (*str)++)
  	    safe_chr(**str, subspace, &nbuf);
  	  *nbuf = '\0';
! 	  if (*str && **str)
  	    (*str)++;
  	  if (is_strict_integer(subspace))
  	    p = abs(parse_integer(subspace));
***************
*** 683,700 ****
  	  break;
  	}
  
- 	if ((!named_substring && p >= global_eval_context.re_subpatterns) ||
- 	    global_eval_context.re_offsets == NULL ||
- 	    global_eval_context.re_from == NULL) {
- 	  /* It's out of bounds, return */
- 	  safe_chr('$', buff, bp);
- 	  if (named_substring)
- 	    safe_format(buff, bp, "<%s>", named_substring);
- 	  else
- 	    safe_integer(p, buff, bp);
- 	  break;
- 	}
- 
  	if (named_substring) {
  	  pcre_copy_named_substring(global_eval_context.re_code,
  				    global_eval_context.re_from,
--- 677,682 ----
***************
*** 823,828 ****
--- 805,832 ----
  	case 'c':		/* command line */
  	  safe_str(global_eval_context.ccom, buff, bp);
  	  break;
+ 	case 'I':
+ 	case 'i':
+ 	  nextc = **str;
+ 	  if (!nextc)
+ 	    goto exit_sequence;
+ 	  (*str)++;
+ 	  if (!isdigit(nextc)) {
+ 	    safe_str(T(e_int), buff, bp);
+ 	    break;
+ 	  }
+ 	  inum_this = nextc - '0';
+ 	  if (inum_this < 0 || inum_this >= inum
+ 	      || (inum - inum_this) <= inum_limit) {
+ 	    safe_str(T("#-1 ARGUMENT OUT OF RANGE"), buff, bp);
+ 	  } else {
+ 	    safe_str(iter_rep[inum - inum_this], buff, bp);
+ 	  }
+ 	  break;
+ 	case 'U':
+ 	case 'u':
+ 	  safe_str(global_eval_context.ucom, buff, bp);
+ 	  break;
  	case 'L':
  	case 'l':		/* enactor location dbref */
  	  /* The security implications of this have
*** 1_8_1.311/src/move.c Sat, 25 Mar 2006 14:30:07 -0600 dunemush (pennmush/b/51_move.c 1.1.1.18.1.5.1.13.1.3.1.9.1.1.1.1.1.2.1.1.1.1.1.33.1.4 660)
--- 1_8_1.336(w)/src/move.c Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/b/51_move.c 1.1.1.18.1.5.1.13.1.3.1.9.1.1.1.1.1.2.1.1.1.1.1.33.1.5 660)
***************
*** 303,310 ****
  {
    int ok;
    if (!strcasecmp(direction, "home")) {
!     ok = !Fixed(player);
!     ok = ok && command_check_byname(player, "HOME");
    } else {
      /* otherwise match on exits - don't use GoodObject here! */
      ok = (match_result(player, direction, TYPE_EXIT, MAT_ENGLISH | MAT_EXIT) !=
--- 303,309 ----
  {
    int ok;
    if (!strcasecmp(direction, "home")) {
!     ok = command_check_byname(player, "HOME");
    } else {
      /* otherwise match on exits - don't use GoodObject here! */
      ok = (match_result(player, direction, TYPE_EXIT, MAT_ENGLISH | MAT_EXIT) !=
***************
*** 931,940 ****
  {
    if (!Mobile(player))
      return;
-   if (!strcasecmp(command, "home") && Fixed(player)) {
-     notify(player, T("You can't do that IC!"));
-     return;
-   }
    if (can_move(player, command))
      do_move(player, command, MOVE_NORMAL);
    else if ((Zone(Location(player)) != NOTHING) && remote_exit(player, command))
--- 930,935 ----
*** 1_8_1.311/src/look.c Sat, 25 Mar 2006 14:44:05 -0600 dunemush (pennmush/c/4_look.c 1.21.1.2.1.9.1.1.1.1.1.58 660)
--- 1_8_1.336(w)/src/look.c Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/c/4_look.c 1.21.1.2.1.9.1.1.1.1.1.61 660)
***************
*** 241,252 ****
    if (a) {
      char *wsave[10], *rsave[NUMQ];
      char *arg, *buff, *bp, *save;
      char const *sp;
      int j;
  
      arg = (char *) mush_malloc(BUFFER_LEN, "string");
      buff = (char *) mush_malloc(BUFFER_LEN, "string");
!     if (!arg || !buff)
        mush_panic("Unable to allocate memory in look_contents");
      save_global_regs("look_contents", rsave);
      for (j = 0; j < 10; j++) {
--- 241,254 ----
    if (a) {
      char *wsave[10], *rsave[NUMQ];
      char *arg, *buff, *bp, *save;
+     char *arg2, *bp2;
      char const *sp;
      int j;
  
      arg = (char *) mush_malloc(BUFFER_LEN, "string");
+     arg2 = (char *) mush_malloc(BUFFER_LEN, "string");
      buff = (char *) mush_malloc(BUFFER_LEN, "string");
!     if (!arg || !buff || !arg2)
        mush_panic("Unable to allocate memory in look_contents");
      save_global_regs("look_contents", rsave);
      for (j = 0; j < 10; j++) {
***************
*** 256,270 ****
--- 258,278 ----
      for (j = 0; j < NUMQ; j++)
        global_eval_context.renv[j][0] = '\0';
      bp = arg;
+     bp2 = arg2;
      DOLIST(thing, Contents(loc)) {
        if (can_see(player, thing, can_see_loc)) {
  	if (bp != arg)
  	  safe_chr(' ', arg, &bp);
  	safe_dbref(thing, arg, &bp);
+ 	if (bp2 != arg2)
+ 	  safe_chr('|', arg2, &bp2);
+ 	safe_str(unparse_object_myopic(player, thing), arg2, &bp2);
        }
      }
      *bp = '\0';
+     *bp2 = '\0';
      global_eval_context.wenv[0] = arg;
+     global_eval_context.wenv[1] = arg2;
      sp = save = safe_atr_value(a);
      bp = buff;
      process_expression(buff, &bp, &sp, loc, player, player,
***************
*** 277,282 ****
--- 285,291 ----
      }
      restore_global_regs("look_contents", rsave);
      mush_free((Malloc_t) arg, "string");
+     mush_free((Malloc_t) arg2, "string");
      mush_free((Malloc_t) buff, "string");
      return;
    }
***************
*** 979,990 ****
    if (a) {
      char *wsave[10], *rsave[NUMQ];
      char *arg, *buff, *bp, *save;
      char const *sp;
      int j;
  
      arg = (char *) mush_malloc(BUFFER_LEN, "string");
      buff = (char *) mush_malloc(BUFFER_LEN, "string");
!     if (!arg || !buff)
        mush_panic("Unable to allocate memory in do_inventory");
      save_global_regs("do_inventory", rsave);
      for (j = 0; j < 10; j++) {
--- 988,1001 ----
    if (a) {
      char *wsave[10], *rsave[NUMQ];
      char *arg, *buff, *bp, *save;
+     char *arg2, *bp2;
      char const *sp;
      int j;
  
      arg = (char *) mush_malloc(BUFFER_LEN, "string");
+     arg2 = (char *) mush_malloc(BUFFER_LEN, "string");
      buff = (char *) mush_malloc(BUFFER_LEN, "string");
!     if (!arg || !buff || !arg2)
        mush_panic("Unable to allocate memory in do_inventory");
      save_global_regs("do_inventory", rsave);
      for (j = 0; j < 10; j++) {
***************
*** 994,1006 ****
--- 1005,1023 ----
      for (j = 0; j < NUMQ; j++)
        global_eval_context.renv[j][0] = '\0';
      bp = arg;
+     bp2 = arg2;
      DOLIST(thing, Contents(player)) {
        if (bp != arg)
  	safe_chr(' ', arg, &bp);
        safe_dbref(thing, arg, &bp);
+       if (bp2 != arg2)
+ 	safe_chr('|', arg2, &bp2);
+       safe_str(unparse_object_myopic(player, thing), arg2, &bp2);
      }
      *bp = '\0';
+     *bp2 = '\0';
      global_eval_context.wenv[0] = arg;
+     global_eval_context.wenv[1] = arg2;
      sp = save = safe_atr_value(a);
      bp = buff;
      process_expression(buff, &bp, &sp, player, player, player,
***************
*** 1013,1018 ****
--- 1030,1036 ----
      }
      restore_global_regs("do_inventory", rsave);
      mush_free((Malloc_t) arg, "string");
+     mush_free((Malloc_t) arg2, "string");
      mush_free((Malloc_t) buff, "string");
      return;
    }
*** 1_8_1.311/src/lock.c Sat, 25 Mar 2006 14:30:07 -0600 dunemush (pennmush/c/6_lock.c 1.17.1.13.1.1.1.1.1.23.1.1.1.4 660)
--- 1_8_1.336(w)/src/lock.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/6_lock.c 1.17.1.13.1.1.1.1.1.23.1.1.1.5 660)
***************
*** 829,834 ****
--- 829,875 ----
    return eval_boolexp(player, b, thing);
  }
  
+ /** Evaluate a lock.
+  * Evaluate lock ltype on thing for player, passing dbrefs for %0/%1.
+  * \param player dbref attempting to pass the lock.
+  * \param thing object containing the lock.
+  * \param ltype type of lock to check.
+  * \retval 1 player passes the lock.
+  * \retval 0 player does not pass the lock.
+  */
+ int
+ eval_lock_with(dbref player, dbref thing, lock_type ltype, dbref env0,
+ 	       dbref env1)
+ {
+   char *myenv[10] = { NULL };
+   char e0[SBUF_LEN], e1[SBUF_LEN], *ep;
+   char *preserves[10];
+   int result;
+ 
+   if (env0 != NOTHING) {
+     ep = e0;
+     safe_dbref(env0, e0, &ep);
+     *ep = '\0';
+     myenv[0] = e0;
+   }
+ 
+   if (env1 != NOTHING) {
+     ep = e1;
+     safe_dbref(env1, e1, &ep);
+     *ep = '\0';
+     myenv[1] = e1;
+   }
+ 
+   save_global_env("eval_lock_save", preserves);
+   restore_global_env("eval_lock", myenv);
+ 
+   boolexp b = getlock(thing, ltype);
+   log_activity(LA_LOCK, thing, unparse_boolexp(player, b, UB_DBREF));
+   result = eval_boolexp(player, b, thing);
+   restore_global_env("eval_lock_save", preserves);
+   return result;
+ }
+ 
  /** Active a lock's failure attributes.
   * \param player dbref failing to pass the lock.
   * \param thing object containing the lock.
*** 1_8_1.311/src/game.c Sat, 25 Mar 2006 15:34:13 -0600 dunemush (pennmush/c/10_game.c 1.50.1.8.1.1.1.1.2.1.1.1.2.1.1.4.1.1.1.1.1.1.1.1.1.1.2.1.1.2.1.1.1.1.1.1.1.2.1.1.1.2.1.1.1.1.1.1.1.1.1.5.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.12.1.3.1.7.1.2.2.1.1.32.1.2.2.1.1.1.1.1.1.2 660)
--- 1_8_1.336(w)/src/game.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/10_game.c 1.50.1.8.1.1.1.1.2.1.1.1.2.1.1.4.1.1.1.1.1.1.1.1.1.1.2.1.1.2.1.1.1.1.1.1.1.2.1.1.1.2.1.1.1.1.1.1.1.1.1.5.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.12.1.3.1.7.1.2.2.1.1.32.1.2.2.1.1.1.1.1.1.4 660)
***************
*** 1132,1137 ****
--- 1132,1138 ----
    strcpy(unp, command);
  
    cptr = command_parse(player, cause, command, from_port);
+   strcpy(global_eval_context.ucom, (cptr ? cptr : ""));
    if (cptr) {
      a = 0;
      if (!Gagged(player)) {
***************
*** 1898,1904 ****
    {
      struct tm *t;
      t = localtime(&mudtime);
!     strftime(tbuf1, sizeof tbuf1, "%I:%M%p ", t);
      nl = tbuf1 + strlen(tbuf1);
    }
    /* System uptime */
--- 1899,1905 ----
    {
      struct tm *t;
      t = localtime(&mudtime);
!     strftime(tbuf1, sizeof tbuf1, "Server uptime: %I:%M%p ", t);
      nl = tbuf1 + strlen(tbuf1);
    }
    /* System uptime */
***************
*** 2153,2158 ****
--- 2154,2171 ----
  		  (options.warn_counter - mudtime) % 60, tbuf1);
    }
  
+   notify_format(player,
+ 		T
+ 		("PennMUSH Uptime: %ld days %ld hours %ld minutes %ld seconds"),
+ 		(mudtime - globals.first_start_time) / 86400,
+ 		((mudtime - globals.first_start_time) % 86400) / 3600,
+ 		(((mudtime - globals.first_start_time) % 86400) % 3600) / 60,
+ 		(((mudtime - globals.first_start_time) % 86400) % 3600) % 60);
+ 
+   /* Mortals, go no further! */
+   if (!Wizard(player) || mortal)
+     return;
+ 
    /* Mortals, go no further! */
    if (!Wizard(player) || mortal)
      return;
*** 1_8_1.311/src/funtime.c Sun, 11 Jul 2004 11:36:53 -0500 dunemush (pennmush/c/12_funtime.c 1.11.1.14.1.1.1.9 660)
--- 1_8_1.336(w)/src/funtime.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/12_funtime.c 1.11.1.14.1.1.1.11 660)
***************
*** 130,136 ****
        a = atr_get(thing, "TZ");
        if (a && is_strict_number(ptr = atr_value(a))) {
  	tz = strtod(ptr, NULL);
! 	if (tz >= -24.0 || tz <= 24.0) {
  	  mytime += (int) (tz * 3600);
  	}
        }
--- 130,136 ----
        a = atr_get(thing, "TZ");
        if (a && is_strict_number(ptr = atr_value(a))) {
  	tz = strtod(ptr, NULL);
! 	if (tz >= -24.0 && tz <= 24.0) {
  	  mytime += (int) (tz * 3600);
  	}
        }
***************
*** 200,205 ****
--- 200,260 ----
  }
  
  /* ARGSUSED */
+ FUNCTION(fun_stringsecs)
+ {
+   /* parse the result from timestring() back into a number of seconds */
+ 
+   int secs = 0;
+   char *str1 = args[0];
+   char str2[BUFFER_LEN];
+   int i;
+ 
+   while (str1 && *str1) {
+     while (*str1 == ' ')
+       str1++;
+     i = 0;
+     while (isdigit((unsigned char) *str1)) {
+       str2[i] = *str1;
+       str1++;
+       i++;
+     }
+     if (i == 0) {
+       safe_str(T("#-1 INVALID TIMESTRING"), buff, bp);	// no numbers
+       return;
+     }
+     str2[i] = '\0';
+     if (!*str1) {
+       secs += parse_integer(str2);	// no more chars, just add seconds and stop
+       break;
+     }
+     switch (*str1) {
+     case 'd':
+     case 'D':
+       secs += (parse_integer(str2) * 86400);	// days
+       break;
+     case 'h':
+     case 'H':
+       secs += (parse_integer(str2) * 3600);	// hours
+       break;
+     case 'm':
+     case 'M':
+       secs += (parse_integer(str2) * 60);	// minutes
+       break;
+     case 's':
+     case 'S':
+     case ' ':
+       secs += parse_integer(str2);	// seconds
+       break;
+     default:
+       safe_str(T("#-1 INVALID TIMESTRING"), buff, bp);
+       return;
+     }
+     str1++;			// move past the time char
+   }
+   safe_integer(secs, buff, bp);
+ }
+ 
+ /* ARGSUSED */
  FUNCTION(fun_timestring)
  {
    /* Convert seconds to #d #h #m #s
*** 1_8_1.311/src/funstr.c Sat, 25 Mar 2006 14:18:45 -0600 dunemush (pennmush/c/13_funstr.c 1.28.1.1.1.2.1.4.1.6.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.3.1.5.1.3.1.2.1.1.1.1.1.1.1.1.1.14.1.36 660)
--- 1_8_1.336(w)/src/funstr.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/13_funstr.c 1.28.1.1.1.2.1.4.1.6.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.3.1.5.1.3.1.2.1.1.1.1.1.1.1.1.1.14.1.38 660)
***************
*** 2124,2129 ****
--- 2124,2130 ----
    int fragment = 0;
    char *say_string;
    char *string;
+   char rbuff[BUFFER_LEN];
  
    speaker = match_thing(executor, args[0]);
    if (speaker == NOTHING || speaker == AMBIGUOUS) {
***************
*** 2204,2210 ****
      break;
    }
  
!   if (!transform) {
      /* nice and easy */
      if (say)
        safe_format(buff, bp, "%s %s \"%s\"", Name(speaker), say_string, string);
--- 2205,2211 ----
      break;
    }
  
!   if (!transform || (!say && !strstr(string, open))) {
      /* nice and easy */
      if (say)
        safe_format(buff, bp, "%s %s \"%s\"", Name(speaker), say_string, string);
***************
*** 2213,2221 ****
      return;
    }
  
-   char rbuff[BUFFER_LEN];
  
!   if (say) {
      /* the whole string has to be transformed */
      wenv[0] = string;
      wenv[1] = speaker_str;
--- 2214,2221 ----
      return;
    }
  
  
!   if (say && !strstr(string, close)) {
      /* the whole string has to be transformed */
      wenv[0] = string;
      wenv[1] = speaker_str;
***************
*** 2237,2265 ****
    } else {
      /* only transform portions of string between open and close */
      char *speech;
-     //char *prev;
      int indx;
      int finished = 0;
      int delete = 0;
  
      funccount = pe_info->fun_invocations;
!     while (!finished && (speech = strstr(string, open))) {
        fragment++;
        indx = string - speech;
        if (indx < 0)
  	indx *= -1;
!       if (string != NULL && strlen(string) > 0)
  	safe_strl(string, indx, buff, bp);
!       speech = speech + strlen(open);	// move past open char
!       // find close-char
        string = strstr(speech, close);
        if (!string || !(string = string + strlen(close))) {
! 	// no close char, or nothing after it; we're at the end!
  	finished = 1;
        }
!       delete = (string == NULL ? 0 : strlen(speech) -
  		(strlen(string) + strlen(close)));
-       //safe_strl(speech, strlen(speech) - delete, buff, bp);
        speech = chopstr(speech, delete);
        wenv[0] = speech;
        wenv[1] = speaker_str;
--- 2237,2271 ----
    } else {
      /* only transform portions of string between open and close */
      char *speech;
      int indx;
      int finished = 0;
      int delete = 0;
  
+     if (say) {
+       safe_str(Name(speaker), buff, bp);
+       safe_chr(' ', buff, bp);
+       safe_str(say_string, buff, bp);
+       safe_chr(' ', buff, bp);
+     }
      funccount = pe_info->fun_invocations;
!     while (!finished && ((say && fragment == 0 && (speech = string))
! 			 || (speech = strstr(string, open)))) {
        fragment++;
        indx = string - speech;
        if (indx < 0)
  	indx *= -1;
!       if (string != NULL && strlen(string) > 0 && indx > 0)
  	safe_strl(string, indx, buff, bp);
!       if (!say || fragment > 1)
! 	speech = speech + strlen(open);	/* move past open char */
!       /* find close-char */
        string = strstr(speech, close);
        if (!string || !(string = string + strlen(close))) {
! 	/* no close char, or nothing after it; we're at the end! */
  	finished = 1;
        }
!       delete = (string == NULL ? strlen(speech) : strlen(speech) -
  		(strlen(string) + strlen(close)));
        speech = chopstr(speech, delete);
        wenv[0] = speech;
        wenv[1] = speaker_str;
***************
*** 2277,2283 ****
  	  break;
        }
        if (strlen(rbuff) > 0) {
- 	// safe_format(buff, bp, T("\"%s\""), rbuff);
  	safe_str(rbuff, buff, bp);
        }
        if (*bp == (buff + BUFFER_LEN - 1) &&
--- 2283,2288 ----
***************
*** 2285,2291 ****
  	break;
      }
      if (string != NULL && strlen(string) > 0) {
!       safe_str(string, buff, bp);	// remaining string (not speech, so not t)
      }
    }
  }
--- 2290,2296 ----
  	break;
      }
      if (string != NULL && strlen(string) > 0) {
!       safe_str(string, buff, bp);	/* remaining string (not speech, so not t) */
      }
    }
  }
*** 1_8_1.311/src/funlist.c Sun, 12 Mar 2006 15:13:36 -0600 dunemush (pennmush/c/16_funlist.c 1.3.1.1.1.5.1.2.1.1.1.1.1.4.1.2.1.2.1.19.1.2.1.1.1.2.1.5.1.1.1.1.1.1.1.1.1.1.2.1.1.3.1.2.1.1.1.1.1.1.1.1.1.1.1.12.1.14.1.7.1.20.1.1.1.1.1.13 660)
--- 1_8_1.336(w)/src/funlist.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/16_funlist.c 1.3.1.1.1.5.1.2.1.1.1.1.1.4.1.2.1.2.1.19.1.2.1.1.1.2.1.5.1.1.1.1.1.1.1.1.1.1.2.1.1.3.1.2.1.1.1.1.1.1.1.1.1.1.1.12.1.14.1.7.1.20.1.1.1.1.1.14 660)
***************
*** 42,49 ****
  /** Type definition for a qsort comparison function */
  typedef int (*comp_func) (const void *, const void *);
  static void sane_qsort(void **array, int left, int right, comp_func compare);
  static void do_itemfuns(char *buff, char **bp, char *str, char *num,
! 			char *word, char *sep, int flag);
  
  char *iter_rep[MAX_ITERS];  /**< itext values */
  int iter_place[MAX_ITERS];  /**< inum numbers */
--- 42,50 ----
  /** Type definition for a qsort comparison function */
  typedef int (*comp_func) (const void *, const void *);
  static void sane_qsort(void **array, int left, int right, comp_func compare);
+ enum itemfun_op { IF_DELETE, IF_REPLACE, IF_INSERT };
  static void do_itemfuns(char *buff, char **bp, char *str, char *num,
! 			char *word, char *sep, enum itemfun_op flag);
  
  char *iter_rep[MAX_ITERS];  /**< itext values */
  int iter_place[MAX_ITERS];  /**< inum numbers */
***************
*** 2210,2220 ****
   * \param num string containing the element number to operate on.
   * \param word string to insert/delete/replace.
   * \param sep separator string.
!  * \param flag operation to perform: 0 - delete, 1 - replace, 2 - insert
   */
  static void
  do_itemfuns(char *buff, char **bp, char *str, char *num, char *word,
! 	    char *sep, int flag)
  {
    char c;
    int el, count, len = -1;
--- 2211,2221 ----
   * \param num string containing the element number to operate on.
   * \param word string to insert/delete/replace.
   * \param sep separator string.
!  * \param flag operation to perform: IF_DELETE, IF_REPLACE, IF_INSERT
   */
  static void
  do_itemfuns(char *buff, char **bp, char *str, char *num, char *word,
! 	    char *sep, enum itemfun_op flag)
  {
    char c;
    int el, count, len = -1;
***************
*** 2233,2239 ****
      c = ' ';
  
    /* we can't remove anything before the first position */
!   if ((el < 1 && flag != 2) || el == 0) {
      safe_str(str, buff, bp);
      return;
    }
--- 2234,2240 ----
      c = ' ';
  
    /* we can't remove anything before the first position */
!   if ((el < 1 && flag != IF_INSERT) || el == 0) {
      safe_str(str, buff, bp);
      return;
    }
***************
*** 2283,2289 ****
      sptr[-1] = '\0';
  
    switch (flag) {
!   case 0:
      /* deletion */
      if (!eptr) {		/* last element in the string */
        if (el != 1)
--- 2284,2290 ----
      sptr[-1] = '\0';
  
    switch (flag) {
!   case IF_DELETE:
      /* deletion */
      if (!eptr) {		/* last element in the string */
        if (el != 1)
***************
*** 2296,2302 ****
        safe_str(eptr, buff, bp);
      }
      break;
!   case 1:
      /* replacing */
      if (!eptr) {		/* last element in string */
        if (el != 1) {
--- 2297,2303 ----
        safe_str(eptr, buff, bp);
      }
      break;
!   case IF_REPLACE:
      /* replacing */
      if (!eptr) {		/* last element in string */
        if (el != 1) {
***************
*** 2314,2320 ****
        safe_str(eptr, buff, bp);
      }
      break;
!   case 2:
      /* insertion */
      if (sptr == str) {		/* first element in string */
        safe_str(word, buff, bp);
--- 2315,2321 ----
        safe_str(eptr, buff, bp);
      }
      break;
!   case IF_INSERT:
      /* insertion */
      if (sptr == str) {		/* first element in string */
        safe_str(word, buff, bp);
***************
*** 2324,2331 ****
        safe_str(str, buff, bp);
        safe_chr(c, buff, bp);
        safe_str(word, buff, bp);
!       safe_chr(c, buff, bp);
!       safe_str(sptr, buff, bp);
      }
      break;
    }
--- 2325,2334 ----
        safe_str(str, buff, bp);
        safe_chr(c, buff, bp);
        safe_str(word, buff, bp);
!       if (sptr && *sptr) {	/* Don't add an osep to the end of the list */
! 	safe_chr(c, buff, bp);
! 	safe_str(sptr, buff, bp);
!       }
      }
      break;
    }
***************
*** 2337,2343 ****
  {
    /* delete a word at position X of a list */
  
!   do_itemfuns(buff, bp, args[0], args[1], NULL, args[2], 0);
  }
  
  /* ARGSUSED */
--- 2340,2346 ----
  {
    /* delete a word at position X of a list */
  
!   do_itemfuns(buff, bp, args[0], args[1], NULL, args[2], IF_DELETE);
  }
  
  /* ARGSUSED */
***************
*** 2345,2351 ****
  {
    /* replace a word at position X of a list */
  
!   do_itemfuns(buff, bp, args[0], args[1], args[2], args[3], 1);
  }
  
  /* ARGSUSED */
--- 2348,2354 ----
  {
    /* replace a word at position X of a list */
  
!   do_itemfuns(buff, bp, args[0], args[1], args[2], args[3], IF_REPLACE);
  }
  
  /* ARGSUSED */
***************
*** 2353,2359 ****
  {
    /* insert a word at position X of a list */
  
!   do_itemfuns(buff, bp, args[0], args[1], args[2], args[3], 2);
  }
  
  /* ARGSUSED */
--- 2356,2362 ----
  {
    /* insert a word at position X of a list */
  
!   do_itemfuns(buff, bp, args[0], args[1], args[2], args[3], IF_INSERT);
  }
  
  /* ARGSUSED */
*** 1_8_1.311/src/fundb.c Sat, 25 Mar 2006 14:44:05 -0600 dunemush (pennmush/c/17_fundb.c 1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.7.1.3.1.3.1.3.1.2.1.2.1.3.2.1.2.1.2.1.1.1.1.4.1.1.1.1.1.1.1.1.1.1.1.3.1.1.2.2.2.1.1.1.1.1.1.42.1.14.1.1.1.1.1.1.1.6 660)
--- 1_8_1.336(w)/src/fundb.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/17_fundb.c 1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.7.1.3.1.3.1.3.1.2.1.2.1.3.2.1.2.1.2.1.1.1.1.4.1.1.1.1.1.1.1.1.1.1.1.3.1.1.2.2.2.1.1.1.1.1.1.42.1.14.1.1.1.1.1.1.1.9 660)
***************
*** 257,278 ****
    char *dp;
    const char *sp;
    char mstr[BUFFER_LEN];
    /* find our object and attribute */
!   dp = mstr;
!   sp = args[0];
!   process_expression(mstr, &dp, &sp, executor, caller, enactor,
! 		     PE_DEFAULT, PT_DEFAULT, pe_info);
!   *dp = '\0';
!   parse_attrib(executor, mstr, &thing, &attrib);
!   if (GoodObject(thing) && attrib && Can_Read_Attr(executor, thing, attrib)) {
!     /* Ok, we've got it */
!     dp = safe_atr_value(attrib);
!     safe_str(dp, buff, bp);
!     free(dp);
!     return;
    }
!   /* We couldn't get it. Evaluate args[1] and return it */
!   sp = args[1];
    process_expression(buff, bp, &sp, executor, caller, enactor,
  		     PE_DEFAULT, PT_DEFAULT, pe_info);
    return;
--- 257,282 ----
    char *dp;
    const char *sp;
    char mstr[BUFFER_LEN];
+   int i;
    /* find our object and attribute */
!   for (i = 1; i < nargs; i++) {
!     mstr[0] = '\0';
!     dp = mstr;
!     sp = args[i - 1];
!     process_expression(mstr, &dp, &sp, executor, caller, enactor, PE_DEFAULT,
! 		       PT_DEFAULT, pe_info);
!     *dp = '\0';
!     parse_attrib(executor, mstr, &thing, &attrib);
!     if (GoodObject(thing) && attrib && Can_Read_Attr(executor, thing, attrib)) {
!       /* Ok, we've got it */
!       dp = safe_atr_value(attrib);
!       safe_str(dp, buff, bp);
!       free(dp);
!       return;
!     }
    }
!   /* We couldn't get it. Evaluate the last arg and return it */
!   sp = args[nargs - 1];
    process_expression(buff, bp, &sp, executor, caller, enactor,
  		     PE_DEFAULT, PT_DEFAULT, pe_info);
    return;
***************
*** 2038,2043 ****
--- 2042,2049 ----
    }
    if (nargs == 1) {
      do_set_atr(thing, s, NULL, executor, 1);
+   } else if (strlen(args[1]) == 0 && !EMPTY_ATTRS) {
+     do_set_atr(thing, s, " ", executor, 1);
    } else {
      do_set_atr(thing, s, args[1], executor, 1);
    }
*** 1_8_1.311/src/function.c Sat, 25 Mar 2006 15:25:38 -0600 dunemush (pennmush/c/18_function.c 1.29.1.14.1.3.1.6.1.1.1.1.1.14.1.2.1.1.1.7.1.22.1.11.1.3.1.24.1.4.1.2.2.1.1.1.1.18.1.3.1.8 660)
--- 1_8_1.336(w)/src/function.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/18_function.c 1.29.1.14.1.3.1.6.1.1.1.1.1.14.1.2.1.1.1.7.1.22.1.11.1.3.1.24.1.4.1.2.2.1.1.1.1.18.1.3.1.13 660)
***************
*** 311,317 ****
    {"CLOCK", fun_clock, 1, 2, FN_REG},
    {"CMSGS", fun_cinfo, 1, 1, FN_REG},
    {"COWNER", fun_cowner, 1, 1, FN_REG},
!   {"CRECALL", fun_crecall, 3, 5, FN_REG},
    {"CSTATUS", fun_cstatus, 2, 2, FN_REG},
    {"CTITLE", fun_ctitle, 2, 2, FN_REG},
    {"CUSERS", fun_cinfo, 1, 1, FN_REG},
--- 311,317 ----
    {"CLOCK", fun_clock, 1, 2, FN_REG},
    {"CMSGS", fun_cinfo, 1, 1, FN_REG},
    {"COWNER", fun_cowner, 1, 1, FN_REG},
!   {"CRECALL", fun_crecall, 1, 5, FN_REG},
    {"CSTATUS", fun_cstatus, 2, 2, FN_REG},
    {"CTITLE", fun_ctitle, 2, 2, FN_REG},
    {"CUSERS", fun_cinfo, 1, 1, FN_REG},
***************
*** 336,342 ****
    {"DEC", fun_dec, 1, 1, FN_REG},
    {"DECOMPOSE", fun_decompose, 1, -1, FN_REG},
    {"DECRYPT", fun_decrypt, 2, 2, FN_REG},
!   {"DEFAULT", fun_default, 2, 2, FN_NOPARSE},
    {"DELETE", fun_delete, 3, 3, FN_REG},
    {"DIE", fun_die, 2, 3, FN_REG},
    {"DIG", fun_dig, 1, 3, FN_REG},
--- 336,342 ----
    {"DEC", fun_dec, 1, 1, FN_REG},
    {"DECOMPOSE", fun_decompose, 1, -1, FN_REG},
    {"DECRYPT", fun_decrypt, 2, 2, FN_REG},
!   {"DEFAULT", fun_default, 2, INT_MAX, FN_NOPARSE},
    {"DELETE", fun_delete, 3, 3, FN_REG},
    {"DIE", fun_die, 2, 3, FN_REG},
    {"DIG", fun_dig, 1, 3, FN_REG},
***************
*** 457,462 ****
--- 457,463 ----
    {"LVPLAYERS", fun_dbwalker, 1, 1, FN_REG},
    {"LVTHINGS", fun_dbwalker, 1, 1, FN_REG},
    {"LWHO", fun_lwho, 0, 1, FN_REG},
+   {"LWHOID", fun_lwho, 0, 1, FN_REG},
    {"MAIL", fun_mail, 0, 2, FN_REG},
    {"MAILFROM", fun_mailfrom, 1, 2, FN_REG},
    {"MAILSEND", fun_mailsend, 2, 2, FN_REG},
***************
*** 486,491 ****
--- 487,493 ----
    {"MUL", fun_mul, 2, INT_MAX, FN_REG},
    {"MUNGE", fun_munge, 3, 5, FN_REG},
    {"MWHO", fun_lwho, 0, 0, FN_REG},
+   {"MWHOID", fun_lwho, 0, 0, FN_REG},
    {"NAME", fun_name, 0, 2, FN_REG},
    {"NAMELIST", fun_namelist, 1, 1, FN_REG},
    {"NAMEGRAB", fun_namegrab, 2, 3, FN_REG},
***************
*** 619,624 ****
--- 621,627 ----
    {"STARTTIME", fun_starttime, 0, 0, FN_REG},
    {"STEP", fun_step, 3, 5, FN_REG},
    {"STRCAT", fun_strcat, 1, INT_MAX, FN_REG},
+   {"STRINGSECS", fun_stringsecs, 1, 1, FN_REG},
    {"STRINSERT", fun_strinsert, 3, -3, FN_REG},
    {"STRIPACCENTS", fun_stripaccents, 1, 1, FN_REG},
    {"STRIPANSI", fun_stripansi, 1, -1, FN_REG},
***************
*** 670,675 ****
--- 673,679 ----
    {"XCON", fun_dbwalker, 3, 3, FN_REG},
    {"XEXITS", fun_dbwalker, 3, 3, FN_REG},
    {"XMWHO", fun_xwho, 2, 2, FN_REG},
+   {"XMWHOID", fun_xwho, 2, 2, FN_REG},
    {"XPLAYERS", fun_dbwalker, 3, 3, FN_REG},
    {"XGET", fun_xget, 2, 2, FN_REG},
    {"XOR", fun_xor, 2, INT_MAX, FN_REG},
***************
*** 679,684 ****
--- 683,689 ----
    {"XVPLAYERS", fun_dbwalker, 3, 3, FN_REG},
    {"XVTHINGS", fun_dbwalker, 3, 3, FN_REG},
    {"XWHO", fun_xwho, 2, 2, FN_REG},
+   {"XWHOID", fun_xwho, 2, 2, FN_REG},
    {"ZEMIT", fun_zemit, 2, -2, FN_REG},
    {"ZFUN", fun_zfun, 1, 11, FN_REG},
    {"ZONE", fun_zone, 1, 2, FN_REG},
***************
*** 1154,1160 ****
    if ((thing = noisy_match_result(player, argv[1], NOTYPE, MAT_EVERYTHING))
        == NOTHING)
      return;
!   if (!Can_Examine(player, thing)) {
      notify(player, T("No permission to examine object."));
      return;
    }
--- 1159,1170 ----
    if ((thing = noisy_match_result(player, argv[1], NOTYPE, MAT_EVERYTHING))
        == NOTHING)
      return;
!   if (SAFER_UFUN) {
!     if (!controls(player, thing)) {
!       notify(player, T("No permission to control object."));
!       return;
!     }
!   } else if (!Can_Examine(player, thing)) {
      notify(player, T("No permission to examine object."));
      return;
    }
*** 1_8_1.311/src/extchat.c Fri, 31 Mar 2006 23:10:16 -0600 dunemush (pennmush/c/23_extchat.c 1.1.1.1.1.1.1.1.1.2.1.1.1.3.1.1.1.5.1.1.1.1.1.5.1.2.1.3.1.3.1.1.1.4.1.2.1.6.1.2.1.1.2.4.2.9.1.2.1.2.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.2.1.1.2.1.1.2.1.1.1.1.1.1.1.1.1.16.1.27.1.4.1.8.1.1.1.5 660)
--- 1_8_1.336(w)/src/extchat.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/23_extchat.c 1.1.1.1.1.1.1.1.1.2.1.1.1.3.1.1.1.5.1.1.1.1.1.5.1.2.1.3.1.3.1.1.1.4.1.2.1.6.1.2.1.1.2.4.2.9.1.2.1.2.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.2.1.1.2.1.1.2.1.1.1.1.1.1.1.1.1.16.1.27.1.4.1.8.1.1.1.6 660)
***************
*** 2201,2214 ****
        safe_str(T("#-1 NO SUCH CHANNEL"), buff, bp);
        return;
      }
!     if (string_prefix(called_as, "CD"))
        safe_str(ChanTitle(c), buff, bp);
!     else if (string_prefix(called_as, "CB"))
!       safe_integer(BufferQSize(ChanBufferQ(c)), buff, bp);
!     else if (string_prefix(called_as, "CU"))
        safe_integer(ChanNumUsers(c), buff, bp);
!     else if (string_prefix(called_as, "CM"))
        safe_integer(ChanNumMsgs(c), buff, bp);
    }
  }
  
--- 2201,2219 ----
        safe_str(T("#-1 NO SUCH CHANNEL"), buff, bp);
        return;
      }
!     if (string_prefix(called_as, "CD")) {
        safe_str(ChanTitle(c), buff, bp);
!     } else if (string_prefix(called_as, "CB")) {
!       if (ChanBufferQ(c) != NULL) {
! 	safe_integer(BufferQSize(ChanBufferQ(c)), buff, bp);
!       } else {
! 	safe_integer(0, buff, bp);
!       }
!     } else if (string_prefix(called_as, "CU")) {
        safe_integer(ChanNumUsers(c), buff, bp);
!     } else if (string_prefix(called_as, "CM")) {
        safe_integer(ChanNumMsgs(c), buff, bp);
+     }
    }
  }
  
*** 1_8_1.311/src/destroy.c Fri, 10 Mar 2006 13:24:59 -0600 dunemush (pennmush/c/24_destroy.c 1.24.2.2.1.3.1.1.1.1.1.1.1.4.1.1.1.1.1.15 660)
--- 1_8_1.336(w)/src/destroy.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/24_destroy.c 1.24.2.2.1.3.1.1.1.1.1.1.1.4.1.1.1.1.1.16 660)
***************
*** 1125,1131 ****
  static void
  check_connected_rooms(void)
  {
!   mark_connected(BASE_ROOM);
    check_connected_marks();
  }
  
--- 1125,1134 ----
  static void
  check_connected_rooms(void)
  {
!   dbref room;
!   for (room = 0; room < db_top; ++room)
!     if ((room == BASE_ROOM) || (IsRoom(room) && Floating(room)))
!       mark_connected(room);
    check_connected_marks();
  }
  
*** 1_8_1.311/src/command.c Sat, 25 Mar 2006 13:49:26 -0600 dunemush (pennmush/c/36_command.c 1.56.1.1.1.1.1.1.1.2.1.1.1.1.1.5.1.2.1.1.1.1.1.2.1.3.1.10.1.1.3.74.1.6.1.3.1.1.1.1.1.1.1.10 660)
--- 1_8_1.336(w)/src/command.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/36_command.c 1.56.1.1.1.1.1.1.1.2.1.1.1.1.1.5.1.2.1.1.1.1.1.2.1.3.1.10.1.1.3.74.1.6.1.3.1.1.1.1.1.1.1.12 660)
***************
*** 350,355 ****
--- 350,359 ----
    {"HUH_COMMAND", NULL, cmd_huh_command,
     CMD_T_ANY | CMD_T_NOPARSE | CMD_T_INTERNAL, 0, 0},
  
+ /* A way to let people override the unimplemented message */
+   {"UNIMPLEMENTED_COMMAND", NULL, cmd_unimplemented,
+    CMD_T_ANY | CMD_T_NOPARSE | CMD_T_INTERNAL, 0, 0},
+ 
    {NULL, NULL, NULL, 0, 0, 0}
  };
  
***************
*** 1151,1170 ****
        safe_str(ls, commandraw, &c2);
      }
      if (cmd->type & CMD_T_EQSPLIT) {
!       safe_chr('=', commandraw, &c2);
!       if (cmd->type & CMD_T_RS_ARGS) {
! 	int rsa_index;
! 	/* This is counterintuitive, but rsa[]
! 	 * starts at 1. */
! 	if (rsa[1]) {
! 	  safe_str(rsa[1], commandraw, &c2);
! 	  for (rsa_index = 2; rsa[rsa_index]; rsa_index++) {
! 	    safe_chr(',', commandraw, &c2);
! 	    safe_str(rsa[rsa_index], commandraw, &c2);
  	  }
  	}
-       } else {
- 	safe_str(rs, commandraw, &c2);
        }
  #ifdef NEVER
        /* We used to do this, but we're not sure why */
--- 1155,1176 ----
        safe_str(ls, commandraw, &c2);
      }
      if (cmd->type & CMD_T_EQSPLIT) {
!       if (rhs_present) {
! 	safe_chr('=', commandraw, &c2);
! 	if (cmd->type & CMD_T_RS_ARGS) {
! 	  int rsa_index;
! 	  /* This is counterintuitive, but rsa[]
! 	   * starts at 1. */
! 	  if (rsa[1]) {
! 	    safe_str(rsa[1], commandraw, &c2);
! 	    for (rsa_index = 2; rsa[rsa_index]; rsa_index++) {
! 	      safe_chr(',', commandraw, &c2);
! 	      safe_str(rsa[rsa_index], commandraw, &c2);
! 	    }
  	  }
+ 	} else {
+ 	  safe_str(rs, commandraw, &c2);
  	}
        }
  #ifdef NEVER
        /* We used to do this, but we're not sure why */
***************
*** 1365,1370 ****
--- 1371,1401 ----
   * with "This command has not been implemented"
   */
  COMMAND (cmd_unimplemented) {
+   char *saveregs[NUMQ];
+ 
+   if (strcmp(cmd->name, "UNIMPLEMENTED_COMMAND") != 0 &&
+       (cmd = command_find("UNIMPLEMENTED_COMMAND"))) {
+     if (!(cmd->type & CMD_T_DISABLED)) {
+       init_global_regs(saveregs);
+       if (run_hook(player, cause, &cmd->hooks.ignore, saveregs, 1)) {
+ 	/* If we have a hook/override, we use that instead */
+ 	if (!has_hook(&cmd->hooks.override) ||
+ 	    !one_comm_match(cmd->hooks.override.obj, player,
+ 			    cmd->hooks.override.attrname, "HUH_COMMAND")) {
+ 	  /* Otherwise, we do hook/before, the command, and hook/after */
+ 	  run_hook(player, cause, &cmd->hooks.before, saveregs, 1);
+ 
+ 	  cmd->func(cmd, player, cause, sw, raw, switches, args_raw,
+ 		    arg_left, args_left, arg_right, args_right);
+ 	  run_hook(player, cause, &cmd->hooks.after, saveregs, 0);
+ 	}
+       }
+       free_global_regs("hook.regs", saveregs);
+       return;
+     }
+   }
+ 
+   /* Either we were already in UNIMPLEMENTED_COMMAND, or we couldn't find it */
    notify(player, "This command has not been implemented");
  }
  
*** 1_8_1.311/src/bsd.c Sun, 12 Mar 2006 15:20:46 -0600 dunemush (pennmush/c/38_bsd.c 1.58.1.11.1.2.1.5.1.7.1.14.1.13.1.9.1.4.1.2.1.12.1.1.1.1.1.2.1.1.1.13.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.8.2.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.48.1.1.1.15.1.10.1.3.1.3 660)
--- 1_8_1.336(w)/src/bsd.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/38_bsd.c 1.58.1.11.1.2.1.5.1.7.1.14.1.13.1.9.1.4.1.2.1.12.1.1.1.1.1.2.1.1.1.13.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.8.2.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.48.1.1.1.15.1.10.1.3.1.7 660)
***************
*** 2457,2462 ****
--- 2457,2463 ----
        send_prefix(d);
        global_eval_context.cplr = d->player;
        strcpy(global_eval_context.ccom, command);
+       strcpy(global_eval_context.ucom, "");
  
        /* Clear %0-%9 and r(0) - r(9) */
        for (j = 0; j < 10; j++)
***************
*** 2468,2473 ****
--- 2469,2475 ----
        process_command(d->player, command, d->player, 1);
        send_suffix(d);
        strcpy(global_eval_context.ccom, "");
+       strcpy(global_eval_context.ucom, "");
        global_eval_context.cplr = NOTHING;
      } else {
        if (!check_connect(d, command))
***************
*** 3788,3793 ****
--- 3790,3796 ----
    int first;
    int start, count;
    int powered = (*(called_as + 1) != 'M');
+   int objid = (index(called_as, 'D') != NULL);
  
    if (!is_strict_integer(args[0]) || !is_strict_integer(args[1])) {
      safe_str(T(e_int), buff, bp);
***************
*** 3813,3818 ****
--- 3816,3825 ----
  	else
  	  safe_chr(' ', buff, bp);
  	safe_dbref(d->player, buff, bp);
+ 	if (objid) {
+ 	  safe_chr(':', buff, bp);
+ 	  safe_integer(CreTime(d->player), buff, bp);
+ 	}
        }
      }
    }
***************
*** 3841,3846 ****
--- 3848,3854 ----
    int first;
    dbref victim;
    int powered = ((*called_as == 'L') && Priv_Who(executor));
+   int objid = (index(called_as, 'D') != NULL);
  
    first = 1;
  
***************
*** 3867,3872 ****
--- 3875,3884 ----
        else
  	safe_chr(' ', buff, bp);
        safe_dbref(d->player, buff, bp);
+       if (objid) {
+ 	safe_chr(':', buff, bp);
+ 	safe_integer(CreTime(d->player), buff, bp);
+       }
      }
    }
  }
***************
*** 4068,4074 ****
      return;
    }
  
!   if (!GoodObject(zone) || !eval_lock(victim, zone, Zone_Lock)) {
      safe_str(T(e_perm), buff, bp);
      return;
    }
--- 4080,4087 ----
      return;
    }
  
!   if (!GoodObject(zone)
!       || (!Priv_Who(executor) && !eval_lock(victim, zone, Zone_Lock))) {
      safe_str(T(e_perm), buff, bp);
      return;
    }
*** 1_8_1.311/src/attrib.c Mon, 06 Feb 2006 14:35:50 -0600 dunemush (pennmush/c/40_attrib.c 1.15.1.2.1.5.1.1.1.3.1.3.1.2.1.2.1.2.2.1.1.2.1.2.1.2.1.1.1.3.1.1.1.1.1.1.3.43.1.15.1.1.1.8 660)
--- 1_8_1.336(w)/src/attrib.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/40_attrib.c 1.15.1.2.1.5.1.1.1.3.1.3.1.2.1.2.1.2.2.1.1.2.1.2.1.2.1.1.1.3.1.1.1.1.1.1.3.43.1.15.1.1.1.9 660)
***************
*** 1253,1258 ****
--- 1253,1263 ----
      if (!s)
        continue;
      *s++ = '\0';
+     if (type == '^' && !AF_Ahear(ptr)) {
+       if ((thing == player && !AF_Mhear(ptr))
+ 	  || (thing != player && AF_Mhear(ptr)))
+ 	continue;
+     }
  
      if (AF_Regexp(ptr)) {
        /* Turn \: into : */
*** 1_8_1.311/src/atr_tab.c Fri, 13 Jan 2006 16:37:42 -0600 dunemush (pennmush/c/41_atr_tab.c 1.39.1.1.1.5 660)
--- 1_8_1.336(w)/src/atr_tab.c Thu, 29 Jun 2006 20:38:41 -0500 dunemush (pennmush/c/41_atr_tab.c 1.39.1.1.1.6 660)
***************
*** 55,60 ****
--- 55,62 ----
    {"nearby", 'n', AF_NEARBY, AF_NEARBY},
    {"noname", 'N', AF_NONAME, AF_NONAME},
    {"nospace", 's', AF_NOSPACE, AF_NOSPACE},
+   {"amhear", 'M', AF_MHEAR, AF_MHEAR},
+   {"aahear", 'A', AF_AHEAR, AF_AHEAR},
    {NULL, '\0', 0, 0}
  };
  
***************
*** 80,85 ****
--- 82,89 ----
    {"nearby", 'n', AF_NEARBY, AF_NEARBY},
    {"noname", 'N', AF_NONAME, AF_NONAME},
    {"nospace", 's', AF_NOSPACE, AF_NOSPACE},
+   {"amhear", 'M', AF_MHEAR, AF_MHEAR},
+   {"aahear", 'A', AF_AHEAR, AF_AHEAR},
    {NULL, '\0', 0, 0}
  };
  
*** 1_8_1.311/hdrs/version.h Fri, 31 Mar 2006 19:32:21 -0600 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.57 660)
--- 1_8_1.336(w)/hdrs/version.h Thu, 29 Jun 2006 20:38:43 -0500 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.58 660)
***************
*** 1,4 ****
  #define VERSION "1.8.1"
! #define PATCHLEVEL "7"
! #define PATCHDATE "[03/21/2006]"
! #define NUMVERSION 1008001007
--- 1,4 ----
  #define VERSION "1.8.1"
! #define PATCHLEVEL "8"
! #define PATCHDATE "[06/03/2006]"
! #define NUMVERSION 1008001008
*** 1_8_1.311/hdrs/lock.h Sat, 25 Mar 2006 14:30:07 -0600 dunemush (pennmush/d/6_lock.h 1.29 660)
--- 1_8_1.336(w)/hdrs/lock.h Thu, 29 Jun 2006 20:38:43 -0500 dunemush (pennmush/d/6_lock.h 1.30 660)
***************
*** 60,65 ****
--- 60,67 ----
  		 boolexp key, int flags);
  void free_locks(lock_list *ll);
  int eval_lock(dbref player, dbref thing, lock_type ltype);
+ int eval_lock_with(dbref player, dbref thing, lock_type ltype, dbref env0,
+ 		   dbref env1);
  int fail_lock(dbref player, dbref thing, lock_type ltype, const char *def,
  	      dbref loc);
  void do_unlock(dbref player, const char *name, lock_type type);
*** 1_8_1.311/hdrs/externs.h Sat, 18 Feb 2006 17:18:28 -0600 dunemush (pennmush/d/16_externs.h 1.1.1.53.1.2.1.8.2.1.1.2.1.1.1.1.1.2.1.6.1.3.1.4.3.1.1.1.1.18.1.8.1.1.1.32.1.1.3.1.1.12.1.4 660)
--- 1_8_1.336(w)/hdrs/externs.h Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/d/16_externs.h 1.1.1.53.1.2.1.8.2.1.1.2.1.1.1.1.1.2.1.6.1.3.1.4.3.1.1.1.1.18.1.8.1.1.1.32.1.1.3.1.1.12.1.4.1.1 660)
***************
*** 206,211 ****
--- 206,212 ----
    int process_command_port;   /**< port number that a command came from */
    dbref cplr;			  /**< initiating player */
    char ccom[BUFFER_LEN];	  /**< raw command */
+   char ucom[BUFFER_LEN];      /**< evaluated command */
    int break_called;	      /**< Has the break command been called? */
    char break_replace[BUFFER_LEN];  /**< What to replace the break with */
    struct real_pcre *re_code;		  /**< The compiled re */
*** 1_8_1.311/hdrs/dbdefs.h Mon, 06 Feb 2006 15:30:48 -0600 dunemush (pennmush/d/18_dbdefs.h 1.1.1.1.1.1.1.1.1.1.1.2.2.2.1.1.1.1.1.1.2.1.1.22.1.6.1.13.2.1.1.1 660)
--- 1_8_1.336(w)/hdrs/dbdefs.h Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/d/18_dbdefs.h 1.1.1.1.1.1.1.1.1.1.1.2.2.2.1.1.1.1.1.1.2.1.1.22.1.6.1.13.2.1.1.1.1.1 660)
***************
*** 171,176 ****
--- 171,178 ----
  #define AF_Debug(a) ((a)->flags & AF_DEBUG)
  #define AF_Nearby(a) ((a)->flags & AF_NEARBY)
  #define AF_Public(a) ((a)->flags & AF_PUBLIC)
+ #define AF_Mhear(a) ((a)->flags & AF_MHEAR)
+ #define AF_Ahear(a) ((a)->flags & AF_AHEAR)
  
  /* Non-mortal checks */
  #define God(x)  ((x) == GOD)
*** 1_8_1.311/hdrs/copyrite.h Fri, 24 Mar 2006 14:37:52 -0600 dunemush (pennmush/d/19_copyrite.h 1.6 660)
--- 1_8_1.336(w)/hdrs/copyrite.h Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/d/19_copyrite.h 1.5.1.2 660)
***************
*** 170,176 ****
   *
   * Past and present PennMUSH development team members:
   *  T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard,
!  *  Shawn Wagner, Ervin Hearn III, Alan "Javelin" Schwartz
   * Past and present PennMUSH porters:
   *  Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III
   * TinyMUSH 2.2, TinyMUSH 3.0, TinyMUX 2, and RhostMUSH developers
--- 170,176 ----
   *
   * Past and present PennMUSH development team members:
   *  T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard,
!  *  Shawn Wagner, Ervin Hearn III, Alan "Javelin" Schwartz, Greg Millam
   * Past and present PennMUSH porters:
   *  Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III
   * TinyMUSH 2.2, TinyMUSH 3.0, TinyMUX 2, and RhostMUSH developers
*** 1_8_1.311/hdrs/attrib.h Mon, 06 Feb 2006 14:35:50 -0600 dunemush (pennmush/d/25_attrib.h 1.4.1.1.1.1.1.2.1.1.1.1.1.2.1.2.1.1.1.2.1.1.2.3.1.10.1.2.1.5.1.1.1.5.1.2.1.3 660)
--- 1_8_1.336(w)/hdrs/attrib.h Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/d/25_attrib.h 1.4.1.1.1.1.1.2.1.1.1.1.1.2.1.2.1.1.1.2.1.1.2.3.1.10.1.2.1.5.1.1.1.5.1.2.1.3.1.1 660)
***************
*** 104,109 ****
--- 104,111 ----
  					   exist in the database */
  #define AF_NONAME       0x8000000	/* No name in did_it */
  #define AF_NOSPACE      0x10000000	/* No space in did_it */
+ #define AF_MHEAR        0x20000000	/* ^-listens can be triggered by %! */
+ #define AF_AHEAR        0x40000000	/* ^-listens can be triggered by anyone */
  
  /* external predefined attributes. */
      extern ATTR attr[];
*** 1_8_1.311/Makefile.SH Fri, 24 Mar 2006 14:43:47 -0600 dunemush (pennmush/d/30_Makefile.S 1.14.1.1.1.7.1.1.1.21.1.2 700)
--- 1_8_1.336(w)/Makefile.SH Thu, 20 Apr 2006 23:05:40 -0500 dunemush (pennmush/d/30_Makefile.S 1.14.1.1.1.7.1.1.1.21.1.3 700)
***************
*** 220,231 ****
  	(cd game; rm -f netmush info_slave)
  
  distclean: 
! 	(cd src; make distclean)
! 	(cd hdrs; rm -f *.orig *~ \#* *.rej *.bak funs.h cmds.h)
! 	(cd utils; rm -f *.orig *~ \#* *.rej *.bak)
  	(cd game; rm -rf *.log netmush info_slave *.orig *.rej *~ *.bak mush.cnf)
  	(cd os2; rm -rf *.rej *.orig *~ *.bak)
  	(cd game/txt; make clean)
  
  totallyclean: distclean 
  	(cd hdrs; rm -rf *.rej)
--- 220,232 ----
  	(cd game; rm -f netmush info_slave)
  
  distclean: 
! 	(cd hdrs; rm -f *.orig *~ \#* *.rej *.bak funs.h cmds.h buildinf.h patches.h)
! 	(cd utils; rm -f *.orig *~ \#* *.rej *.bak mkcmds.sh)
  	(cd game; rm -rf *.log netmush info_slave *.orig *.rej *~ *.bak mush.cnf)
  	(cd os2; rm -rf *.rej *.orig *~ *.bak)
+ 	(cd src; make distclean; rm -f Makefile)
  	(cd game/txt; make clean)
+ 	(rm -rf .config Makefile config.h config.sh options.h)
  
  totallyclean: distclean 
  	(cd hdrs; rm -rf *.rej)
*** 1_8_1.311/win32/funs.h Sat, 25 Mar 2006 15:34:13 -0600 dunemush (pennmush/f/12_funs.h 1.11.1.9.2.8.2.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.8.1.3.1.7.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.10.1.1.1.4.1.5.1.1.1.1.1.10.1.5 640)
--- 1_8_1.336(w)/win32/funs.h Sat, 03 Jun 2006 17:14:15 -0500 dunemush (pennmush/f/12_funs.h 1.11.1.9.2.8.2.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.8.1.3.1.7.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.10.1.1.1.4.1.5.1.1.1.1.1.10.1.6 640)
***************
*** 304,309 ****
--- 304,310 ----
  FUNCTION_PROTO(fun_stddev);
  FUNCTION_PROTO(fun_step);
  FUNCTION_PROTO(fun_strcat);
+ FUNCTION_PROTO(fun_stringsecs);
  FUNCTION_PROTO(fun_strinsert);
  FUNCTION_PROTO(fun_stripaccents);
  FUNCTION_PROTO(fun_stripansi);
*** 1_8_1.311/game/txt/hlp/pennconf.hlp Mon, 24 May 2004 21:23:02 -0500 dunemush (pennmush/f/43_pennconf.h 1.16 600)
--- 1_8_1.336(w)/game/txt/hlp/pennconf.hlp Sat, 03 Jun 2006 16:48:38 -0500 dunemush (pennmush/f/43_pennconf.h 1.17 600)
***************
*** 5,16 ****
   @config <category> for details on each.
  
    Attribs      Chat       Cmds        Cosmetic      Costs
!   Db           Dump       Funcs       Limits        Log
!   Net          Tiny
  
   The categories and groups are the same as those used by @config/list.
   Values must be of the listed type for each option. They include:
   <number>, <dbref>, <boolean> (Yes/No), <time>, or <string>.
  & @config attribs
   These options control some attribute behavior.
  
--- 5,24 ----
   @config <category> for details on each.
  
    Attribs      Chat       Cmds        Cosmetic      Costs
!   Db           Dump       Flags       Funcs         Limits
!   Log          Net        Tiny
  
   The categories and groups are the same as those used by @config/list.
   Values must be of the listed type for each option. They include:
   <number>, <dbref>, <boolean> (Yes/No), <time>, or <string>.
+ 
+  Options which take a <time> will accept either a number of seconds
+  or a combination of numbers followed by 's' for seconds, 'm' for
+  minutes or 'h' for hours, making 1h30m and 5400 equivalent.
+ 
+  <dbref> options can be given with or without the leading '#', so
+  '1' and '#1' are the same.
+ 
  & @config attribs
   These options control some attribute behavior.
  
***************
*** 19,53 ****
    player_listen=<boolean>: Is @listen checked on players?
    player_ahear=<boolean>: Is @ahear triggered on players?
    room_connects=<boolean>: Are @aconnect and @adisconnect triggered on rooms?
-   global_connects=<boolean>: Are @aconnect and @adisconnect triggered on
-    objects in the master room?
    read_remote_desc=<boolean>: Can anyone remotely retrieve @descs?
  & @config chat
   These options control chat system settings.
  
    chan_cost=<number>: How many pennies a channel costs to create.
    max_channels=<number>: How many channels can exist total.
!   max_player_channels=>number>: How many channels can each non-admin
     player create? If 0, mortals cannot create channels.
  & @config cmds
   These options affect command behavior.
  
-   globals=<boolean>: Is the master room checked for commands and exits?
    noisy_whisper=<boolean>: Does whisper default to whisper/noisy?
    possessive_get=<boolean>: Does "get container's object" work?
    possessive_get_d=<boolean>: Does it work on disconnected players?
    link_to_object=<boolean>: Can exits have objects as their destination?
    owner_queues=<boolean>: Are command queues kept per-owner, or per-object?
-   restricted_building=<boolean>: Does it take the builder @power to build?
-   free_objects=<boolean>: If restricted_building is on, can @create be used
-    without the builder @power?
    full_invis=<boolean>: Should say by a dark player show up as
     'Someone says,'?
    wiz_noaenter=<boolean>: If yes, dark players don't trigger @aenters.
-   player_locate=<boolean>: Can mortals find the locations of remote players?
-   cemit_power=<boolean>: Should the cemit @power control @cemit?
    really_safe=<boolean>: Does SAFE prevent @nuking?
-   hate_dest=<boolean>: Does @destroy work?
    destroy_possessions=<boolean>: When a player is destroyed, are their objects
     as well?
  & @config cosmetic
--- 27,54 ----
    player_listen=<boolean>: Is @listen checked on players?
    player_ahear=<boolean>: Is @ahear triggered on players?
    room_connects=<boolean>: Are @aconnect and @adisconnect triggered on rooms?
    read_remote_desc=<boolean>: Can anyone remotely retrieve @descs?
+   startups=<boolean>: Are @startup triggered at restart?
+   empty_attrs=<boolean>: Can attributes be set to an empty string?
  & @config chat
   These options control chat system settings.
  
    chan_cost=<number>: How many pennies a channel costs to create.
    max_channels=<number>: How many channels can exist total.
!   max_player_channels=<number>: How many channels can each non-admin
     player create? If 0, mortals cannot create channels.
  & @config cmds
   These options affect command behavior.
  
    noisy_whisper=<boolean>: Does whisper default to whisper/noisy?
    possessive_get=<boolean>: Does "get container's object" work?
    possessive_get_d=<boolean>: Does it work on disconnected players?
    link_to_object=<boolean>: Can exits have objects as their destination?
    owner_queues=<boolean>: Are command queues kept per-owner, or per-object?
    full_invis=<boolean>: Should say by a dark player show up as
     'Someone says,'?
    wiz_noaenter=<boolean>: If yes, dark players don't trigger @aenters.
    really_safe=<boolean>: Does SAFE prevent @nuking?
    destroy_possessions=<boolean>: When a player is destroyed, are their objects
     as well?
  & @config cosmetic
***************
*** 57,64 ****
    money_plural=<string>: What are many pennies called?
    player_name_spaces=<boolean>: Can player names have spaces in them?
    ansi_names=<boolean>: Are names in look hilighted?
-   ansi_justify=<boolean>: Do ljust() and rjust() take ansi codes into
-    account?
    float_precision=<numbers>: How many digits after the decimal point in
     floating point numbers are kept when formatting the result of a
     floating point function?
--- 58,63 ----
***************
*** 107,131 ****
  & @config db
   These are database options.
  
!  player_start=<dbref>: What room newly created players are in.
!  master_room=<dbref>: The location of the master room.
!  ancestor_room=<dbref>: If set to a good object, this is considered a global
!   parent for all rooms. If -1 or a nonexistant object, then disabled.
!  ancestor_exit=<dbref>: As ancestor_room for exits.
!  ancestor_thing=<dbref>: As ancestor_room for things.
!  ancestor_player=<dbref>: As ancestor_room for players.
!  base_room=<dbref>: The starting room used to determine if other rooms
!   are disconnected.
!  default_home=<dbref>: The room to send things to when they're homeless.
!  exits_connect_rooms=<boolean>: Is a room with any exit at all in not
!   considered disconnected for FLOATING checks?
  & @config dump
   These options affect database saves and other periodic checks.
  
-  The ones that take times will accept the time as either a
-  plain number, or a number with a suffix 's' for seconds or 'm' for
-  minutes or 'h' for hours.
- 
    forking_dump=<boolean>: Does the game clone itself and save in the
     copy, or just pause while the save happens?
    dump_message=<string>: Notification message for a database save.
--- 106,128 ----
  & @config db
   These are database options.
  
!   player_start=<dbref>: What room newly created players are in.
!   master_room=<dbref>: The location of the master room.
!   ancestor_room=<dbref>: If set to a good object, this is considered a global
!    parent for all rooms. If -1 or a nonexistant object, then disabled.
!   ancestor_exit=<dbref>: As ancestor_room for exits.
!   ancestor_thing=<dbref>: As ancestor_room for things.
!   ancestor_player=<dbref>: As ancestor_room for players.
!   base_room=<dbref>: The starting room used to determine if other rooms
!    are disconnected.
!   default_home=<dbref>: The room to send things to when they're homeless.
!   exits_connect_rooms=<boolean>: Is a room with any exit at all in not
!    considered disconnected for FLOATING checks?
!   zone_control_zmp_only=<boolean>: Do we only perform control checks on ZMPs,
!    or do we check ZMOs and ZMRs too?
  & @config dump
   These options affect database saves and other periodic checks.
  
    forking_dump=<boolean>: Does the game clone itself and save in the
     copy, or just pause while the save happens?
    dump_message=<string>: Notification message for a database save.
***************
*** 136,155 ****
    warn_interval=<time>: Seconds between automatic @wchecks.
    purge_interval=<time>: Seconds between automatic @purges.
    dbck_interval=<time>: Seconds between automatic @dbcks.
  & @config funcs
   These options affect the behavior of some functions.
  
!  haspower_restricted=<boolean>: Is haspower() available only to objects
!   with see_all?
!  safer_ufun=<boolean>: Are objects stopped from evaluting attributes on
!   objects with more privileges than themselves?
  & @config limits
   Limits and other constants.
  
-  The ones that take times will accept the time as either a
-  plain number, or a number with a suffix 's' for seconds or 'm' for
-  minutes or 'h' for hours.
- 
    max_dbref=<dbref>: The highest dbref an object can have. If 0,
     there is no limit on database size.
    max_attrs_per_obj=<number>: The maximum attributes an object can have.
--- 133,157 ----
    warn_interval=<time>: Seconds between automatic @wchecks.
    purge_interval=<time>: Seconds between automatic @purges.
    dbck_interval=<time>: Seconds between automatic @dbcks.
+ & @config flags
+   These options set the default flags for newly-created objects and channels.
+ 
+   player_flags=<string>: List of flags to set on newly created players
+   room_flags=<string>: List of flags to set on newly created rooms
+   thing_flags=<string>: List of flags to set on newly created things
+   exit_flags=<string>: List of flags to set on newly created exits
+   room_flags=<string>: List of flags to set on newly created rooms
+   channel_flags=<string>: List of flags to set on newly created channels
  & @config funcs
   These options affect the behavior of some functions.
  
!   safer_ufun=<boolean>: Are objects stopped from evaluting attributes on
!    objects with more privileges than themselves?
!   function_side_effects=<boolean>: Are function side effects (functions which
!    alter the database) allowed?
  & @config limits
   Limits and other constants.
  
    max_dbref=<dbref>: The highest dbref an object can have. If 0,
     there is no limit on database size.
    max_attrs_per_obj=<number>: The maximum attributes an object can have.
***************
*** 197,209 ****
     queue entry can take to run.
    use_quota=<boolean>: Controls if quotas are used to limit the number
     of objects a player can own.
  & @config log
   These options affect logging.
  
    log_commands=<boolean>: Are all commands logged?
-   log_huhs=<boolean>: Are commands that produce Huh? messages logged?
    log_forces=<boolean>: Are @forces of wizard objects logged?
-   log_walls=<boolean>: Are @walls logged?
  & @config net
   Networking and connection-related options.
   
--- 199,220 ----
     queue entry can take to run.
    use_quota=<boolean>: Controls if quotas are used to limit the number
     of objects a player can own.
+ 
+ Continued in help @config limits4
+ & @config limits4
+  Limits and constants, continued
+ 
+   max_aliases=<number>: The maximum number of aliases a player can have.
+   keepalive_timeout=<time>: How often should an 'Are you still there?' query
+    be sent to connects, to stop players' routers booting idle connections?
+   max_parents=<number>: The maximum number of levels of parenting allowed.
+   call_limit=<number>: The maximum number of times the parser can be called
+    recursively for any one expression.
  & @config log
   These options affect logging.
  
    log_commands=<boolean>: Are all commands logged?
    log_forces=<boolean>: Are @forces of wizard objects logged?
  & @config net
   Networking and connection-related options.
   
*** 1_8_1.311/game/txt/hlp/pennvOLD.hlp Fri, 10 Mar 2006 13:25:25 -0600 dunemush (pennmush/g/30_pennvOLD.h 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.2.1.5.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2 660)
--- 1_8_1.336(w)/game/txt/hlp/pennvOLD.hlp Thu, 29 Jun 2006 20:38:43 -0500 dunemush (pennmush/g/30_pennvOLD.h 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.2.1.5.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.4 660)
***************
*** 4417,4423 ****
  For information on a specific patchlevel of one of the versions listed,
  type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
  
! 1.8.1: 0, 1, 2, 3, 4, 5, 6, 7
  1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
  1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
         19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
--- 4417,4423 ----
  For information on a specific patchlevel of one of the versions listed,
  type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
  
! 1.8.1: 0, 1, 2, 3, 4, 5, 6, 7, 8
  1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
  1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
         19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
*** 1_8_1.311/src/notify.c Thu, 16 Feb 2006 12:19:23 -0600 dunemush (pennmush/g/35_notify.c 1.41.1.10.1.9.1.1 660)
--- 1_8_1.336(w)/src/notify.c Thu, 29 Jun 2006 20:38:42 -0500 dunemush (pennmush/g/35_notify.c 1.41.1.10.1.9.1.1.1.1 660)
***************
*** 970,980 ****
        }
      }
      /* if object is flagged LISTENER, check for ^ listen patterns
-      *    * these are like AHEAR - object cannot trigger itself.
       *    * unlike normal @listen, don't pass the message on.
       *    */
  
!     if ((speaker != target) && (ThingListen(target) || RoomListen(target))
  	&& eval_lock(speaker, target, Listen_Lock)
        )
        atr_comm_match(target, speaker, '^', ':',
--- 970,979 ----
        }
      }
      /* if object is flagged LISTENER, check for ^ listen patterns
       *    * unlike normal @listen, don't pass the message on.
       *    */
  
!     if ((ThingListen(target) || RoomListen(target))
  	&& eval_lock(speaker, target, Listen_Lock)
        )
        atr_comm_match(target, speaker, '^', ':',
*** 1_8_1.311/game/aliascnf.dst Fri, 10 Mar 2006 13:25:25 -0600 dunemush (pennmush/h/11_aliascnf.d 1.5 600)
--- 1_8_1.336(w)/game/aliascnf.dst Mon, 10 Apr 2006 22:49:38 -0500 dunemush (pennmush/h/11_aliascnf.d 1.6 600)
***************
*** 60,66 ****
  function_alias nvthings nvobjects
  function_alias xthings xobjects
  function_alias xvthings xvobjects
! functoin_alias atrlock attrlock
  
  # For rhost compatibility
  function_alias textfile dynhelp
--- 60,66 ----
  function_alias nvthings nvobjects
  function_alias xthings xobjects
  function_alias xvthings xvobjects
! function_alias atrlock attrlock
  
  # For rhost compatibility
  function_alias textfile dynhelp
*** 1_8_1.311/game/txt/hlp/pennv181.hlp Sat, 25 Mar 2006 15:25:38 -0600 dunemush (pennmush/h/29_pennv181.h 1.121 660)
--- 1_8_1.336(w)/game/txt/hlp/pennv181.hlp Thu, 29 Jun 2006 20:38:43 -0500 dunemush (pennmush/h/29_pennv181.h 1.139 660)
***************
*** 1,4 ****
! & 1.8.1p7
  & changes
  This is a list of changes in this patchlevel which are probably of
  interest to players. More information about new commands and functions
--- 1,4 ----
! & 1.8.1p8
  & changes
  This is a list of changes in this patchlevel which are probably of
  interest to players. More information about new commands and functions
***************
*** 11,16 ****
--- 11,78 ----
  A list of the patchlevels associated with each release can
  be read in 'help patchlevels'.
  
+ Version 1.8.1 patchlevel 8                      June 3, 2006
+ 
+ Attributes:
+   * New 'AAHEAR' and 'AMHEAR' attribute flags, when set on an
+     ^listen attribute, cause it to behave like @aahear or
+     @amhear respectively, instead of like @ahear. Suggested by
+     Jules@M*U*S*H. Patch by Talvo@M*U*S*H.
+   * New UNIMPLEMENTED_COMMAND command handles commands that
+     are known but not implemented (currently just @SQL). By default,
+     produces a standard message, but can now be @hooked, etc.
+     Suggested by Talvo@M*U*S*H. [TAP].
+   * @conformat and @invformat are now passed a |-delimited list
+     of object names, unparsed in the default fashion, as %1. Patch
+     by Talvo@M*U*S*H.
+ Functions:
+   * default() can now take any number of obj/attr cases. Suggested
+     by Nathan Baum, patch by Talvo@M*U*S*H.
+   * lwhoid(), mwhoid(), xwhoid(), xmwhoid() work like lwho(), etc.
+     but return objids instead of dbrefs. Patch by Talvo@M*U*S*H.
+   * stringsecs() converts timestrings to seconds. Patch by Talvo@M*U*S*H.
+ Minor changes:
+   * %u is now set to the evaluated typed $command (when a $command
+     is matched) and is available to locks. Suggested
+     by Jules@M*U*S*H, patch by Talvo@M*U*S*H.
+   * Rooms reachable from FLOATING rooms are now considered topologically
+     connected, just like rooms reachable from the base room.
+     Patch by Nathan Baum.
+   * %i0-%i9 evaluates to itext(0)-itext(9) for convenience in iter(). 
+     Suggested by Nathan Baum. Patch by Talvo@M*U*S*H.
+   * When safer_ufun is on, you must control an object to @function
+     an attribute on it. This prevents, e.g., mortals with @function power
+     from making attributes on wizard objects into @functions. 
+     Suggested by Talvo@M*U*S*H.
+   * Internal eval_lock_with function added to support passing special
+     %0/%1 values to lock evaluations. Suggested by Malix@8bit.
+   * Improved @uptime display by Ambrosia@M*U*S*H.
+   * Players may @search a ZMP if they pass the zone lock. Patch by
+     Talvo@M*U*S*H.
+ Fixes:
+   * cbuffer() crash fixed. Report by qa'toq@ST:Foundations. [GM]
+   * regex crash bug fixed. [GM]
+   * insert() added an extra delimiter when inserting at end of list.
+     Report by Sangman. [SW]
+   * make distclean is more thorough. Patch by Ranmir@M*U*S*H.
+   * EQSPLIT commands with no equal sign that were hooked were passed to the 
+     hook attribute with an equal sign (and nothing to the right).
+     Fixed. Suggested by Talvo@M*U*S*H.
+   * zwho/zmwho can now be used by see_all players on any zone.
+     Suggested by Talvo@M*U*S*H.
+   * crecall() now accepts 1 or 2 arguments, as promised. Report by
+     Sketch@M*U*S*H.
+   * attrib_set(obj/attr,) sets the attribute to a single space
+     when EMPTY_ATTRS is off. Patch by Talvo@M*U*S*H.
+   * Portability fix in fun_speak. [EEH]
+   * Fix to TZ parsing in src/funtime.c by Jules@M*U*S*H.
+   * Fix to speak() for fragments of speech by Talvo@M*U*S*H based on
+     report by Trelane@M*U*S*H.
+   * Typo fixes in game/aliascnf.dst by Talvo@M*U*S*H.
+   * Help fixes by Talvo@M*U*S*H, Sketch@M*U*S*H.
+ 
+ 
+ & 1.8.1p7
  Version 1.8.1 patchlevel 7                      March 21, 2006
  
  Major changes: ** PLEASE READ **
***************
*** 37,43 ****
      default values. Patch by Nathan Baum.
    * unique() function removes contiguous duplicates in lists. [SW]
    * nextdbref() returns the next dbref on the free list. 
!     Patch by Talvo@M*U*S*H.
    * Specifying more than one type to locate() now makes each of them
      preferred (not just the last one). Suggested by Anyasha@ST:Foundations.
    * namelist() parses a list of dbrefs and possibly-quoted names a la page
--- 99,105 ----
      default values. Patch by Nathan Baum.
    * unique() function removes contiguous duplicates in lists. [SW]
    * nextdbref() returns the next dbref on the free list. 
!     Suggested by Jules@M*U*S*H. Patch by Talvo@M*U*S*H.
    * Specifying more than one type to locate() now makes each of them
      preferred (not just the last one). Suggested by Anyasha@ST:Foundations.
    * namelist() parses a list of dbrefs and possibly-quoted names a la page
*** 1_8_1.311/CHANGES.181 Sat, 25 Mar 2006 15:25:38 -0600 dunemush (pennmush/h/30_CHANGES.18 1.117 600)
--- 1_8_1.336(w)/CHANGES.181 Fri, 23 Jun 2006 11:10:17 -0500 dunemush (pennmush/h/30_CHANGES.18 1.135 600)
***************
*** 14,19 ****
--- 14,80 ----
  
  ==========================================================================
  
+ Version 1.8.1 patchlevel 8                      June 3, 2006
+ 
+ Attributes:
+   * New 'AAHEAR' and 'AMHEAR' attribute flags, when set on an
+     ^listen attribute, cause it to behave like @aahear or
+     @amhear respectively, instead of like @ahear. Suggested by
+     Jules@M*U*S*H. Patch by Talvo@M*U*S*H.
+   * New UNIMPLEMENTED_COMMAND command handles commands that
+     are known but not implemented (currently just @SQL). By default,
+     produces a standard message, but can now be @hooked, etc.
+     Suggested by Talvo@M*U*S*H. [TAP].
+   * @conformat and @invformat are now passed a |-delimited list
+     of object names, unparsed in the default fashion, as %1. Patch
+     by Talvo@M*U*S*H.
+ Functions:
+   * default() can now take any number of obj/attr cases. Suggested
+     by Nathan Baum, patch by Talvo@M*U*S*H.
+   * lwhoid(), mwhoid(), xwhoid(), xmwhoid() work like lwho(), etc.
+     but return objids instead of dbrefs. Patch by Talvo@M*U*S*H.
+   * stringsecs() converts timestrings to seconds. Patch by Talvo@M*U*S*H.
+ Minor changes:
+   * %u is now set to the evaluated typed $command (when a $command
+     is matched) and is available to locks. Suggested
+     by Jules@M*U*S*H, patch by Talvo@M*U*S*H.
+   * Rooms reachable from FLOATING rooms are now considered topologically
+     connected, just like rooms reachable from the base room.
+     Patch by Nathan Baum.
+   * %i0-%i9 evaluates to itext(0)-itext(9) for convenience in iter(). 
+     Suggested by Nathan Baum. Patch by Talvo@M*U*S*H.
+   * When safer_ufun is on, you must control an object to @function
+     an attribute on it. This prevents, e.g., mortals with @function power
+     from making attributes on wizard objects into @functions. 
+     Suggested by Talvo@M*U*S*H.
+   * Internal eval_lock_with function added to support passing special
+     %0/%1 values to lock evaluations. Suggested by Malix@8bit.
+   * Improved @uptime display by Ambrosia@M*U*S*H.
+   * Players may @search a ZMP if they pass the zone lock. Patch by
+     Talvo@M*U*S*H.
+ Fixes:
+   * cbuffer() crash fixed. Report by qa'toq@ST:Foundations. [GM]
+   * regex crash bug fixed. [GM]
+   * insert() added an extra delimiter when inserting at end of list.
+     Report by Sangman. [SW]
+   * make distclean is more thorough. Patch by Ranmir@M*U*S*H.
+   * EQSPLIT commands with no equal sign that were hooked were passed to the 
+     hook attribute with an equal sign (and nothing to the right).
+     Fixed. Suggested by Talvo@M*U*S*H.
+   * zwho/zmwho can now be used by see_all players on any zone.
+     Suggested by Talvo@M*U*S*H.
+   * crecall() now accepts 1 or 2 arguments, as promised. Report by
+     Sketch@M*U*S*H.
+   * attrib_set(obj/attr,) sets the attribute to a single space
+     when EMPTY_ATTRS is off. Patch by Talvo@M*U*S*H.
+   * Portability fix in fun_speak. [EEH]
+   * Fix to TZ parsing in src/funtime.c by Jules@M*U*S*H.
+   * Fix to speak() for fragments of speech by Talvo@M*U*S*H based on
+     report by Trelane@M*U*S*H.
+   * Typo fixes in game/aliascnf.dst by Talvo@M*U*S*H.
+   * Help fixes by Talvo@M*U*S*H, Sketch@M*U*S*H.
+ 
+ 
  Version 1.8.1 patchlevel 7                      March 21, 2006
  
  Major changes: ** PLEASE READ **
***************
*** 40,46 ****
      default values. Patch by Nathan Baum.
    * unique() function removes contiguous duplicates in lists. [SW]
    * nextdbref() returns the next dbref on the free list. 
!     Patch by Talvo@M*U*S*H.
    * Specifying more than one type to locate() now makes each of them
      preferred (not just the last one). Suggested by Anyasha@ST:Foundations.
    * namelist() parses a list of dbrefs and possibly-quoted names a la page
--- 101,107 ----
      default values. Patch by Nathan Baum.
    * unique() function removes contiguous duplicates in lists. [SW]
    * nextdbref() returns the next dbref on the free list. 
!     Suggested by Jules@M*U*S*H. Patch by Talvo@M*U*S*H.
    * Specifying more than one type to locate() now makes each of them
      preferred (not just the last one). Suggested by Anyasha@ST:Foundations.
    * namelist() parses a list of dbrefs and possibly-quoted names a la page