Merge branch 'derek-elbereth'

* derek-elbereth:
  ensure that the 'safe' objects remain safe
  finish up the changes to trigger erosion on use
  initial pass for toning down Elbereth

Conflicts:
	dat/castle.des
	dat/sokoban.des
	include/extern.h
	src/engrave.c
	src/mklev.c
	src/monmove.c
	src/zap.c

diff --cc dat/castle.des
index 6a6bcab444bda194f94ad59df89efab16c561e68,bab8cec0aeef7493687585045211777bad7f3491..f6252667eb3547d2b80998f0bce646c08e8975f7
--- 1/dat/castle.des
--- 2/dat/castle.des
+++ b/dat/castle.des
@@@ -1,5 -1,5 +1,4 @@@
- # NetHack 3.6 castle.des      $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
- # NetHack 3.6 castle.des      $Date: 2009/05/06 10:44:18 $  $Revision: 1.5 $
 -# NetHack 3.5 castle.des      $NHDT-Date: 1430348677 2015/04/29 23:04:37 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.8 $
 -# NetHack 3.5 castle.des      $Date: 2009/05/06 10:44:18 $  $Revision: 1.5 $
++# NetHack 3.6 castle.des      $NHDT-Date: 1430348677 2015/04/29 23:04:37 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.8 $
  #     SCCS Id: @(#)castle.des 3.5     2002/05/02
  #     Copyright (c) 1989 by Jean-Christophe Collet
  # NetHack may be freely redistributed.  See license for details.

diff --cc dat/sokoban.des
index 84a3a783ff809c3541e73accfd74a63a1bf8ea29,16ea85f32a79130167277004c502bdaf62fa01af..30ad5a63240753e640a9bacfaddb2ce0c686b718
--- 1/dat/sokoban.des
--- 2/dat/sokoban.des
+++ b/dat/sokoban.des
@@@ -1,5 -1,5 +1,4 @@@
- # NetHack 3.6 sokoban.des     $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
- # NetHack 3.6 sokoban.des     $Date: 2009/05/06 10:44:24 $  $Revision: 1.5 $
 -# NetHack 3.5 sokoban.des     $NHDT-Date: 1430348694 2015/04/29 23:04:54 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.11 $
 -# NetHack 3.5 sokoban.des     $Date: 2009/05/06 10:44:24 $  $Revision: 1.5 $
++# NetHack 3.6 sokoban.des     $NHDT-Date: 1430348694 2015/04/29 23:04:54 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.11 $
  #     SCCS Id: @(#)sokoban.des        3.5     1999/03/15
  #     Copyright (c) 1998-1999 by Kevin Hugo
  # NetHack may be freely redistributed.  See license for details.

diff --cc include/extern.h
Simple merge

diff --cc src/engrave.c
Simple merge

diff --cc src/mklev.c
index 059c7a3281f40eb64f43c2967f0f3ee10d8f62be,95115f32ef77fb00bc9b96d7eae7869d7f218a6a..1ecf46f678d4eed138eb086bcb9ea57c692bef7e
--- 1/src/mklev.c
--- 2/src/mklev.c
+++ b/src/mklev.c
@@@ -1,5 -1,4 +1,4 @@@
- /* NetHack 3.6        mklev.c $NHDT-Date: 1426465436 2015/03/16 00:23:56 $  $NHDT-Branch: debug $:$NHDT-Revision: 1.25 $ */
- /* NetHack 3.6        mklev.c $Date: 2012/02/15 01:55:33 $  $Revision: 1.20 $ */
 -/* NetHack 3.5        mklev.c $NHDT-Date: 1430172946 2015/04/27 22:15:46 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.38 $ */
++/* NetHack 3.6        mklev.c $NHDT-Date: 1430172946 2015/04/27 22:15:46 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.38 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/monmove.c
index 9e293277d41a6db527b2ca01c1a0e5e1832445f2,56e7b4871cec45a8a44f2157023904a659e6723f..633e66e21aa8bef352b8625155e11b7e94cc7692
--- 1/src/monmove.c
--- 2/src/monmove.c
+++ b/src/monmove.c
@@@ -1,5 -1,5 +1,4 @@@
- /* NetHack 3.6        monmove.c       $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
- /* NetHack 3.6        monmove.c       $Date: 2011/08/30 22:13:27 $  $Revision: 1.46 $ */
 -/* NetHack 3.5        monmove.c       $NHDT-Date: 1430172947 2015/04/27 22:15:47 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.62 $ */
 -/* NetHack 3.5        monmove.c       $Date: 2011/08/30 22:13:27 $  $Revision: 1.46 $ */
++/* NetHack 3.6        monmove.c       $NHDT-Date: 1430172947 2015/04/27 22:15:47 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.62 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/zap.c
index fb41561ac4060d04192ec7418d754aa2320b1069,411a674fae0e68ddd7a1f3d5543374d9eff538ba..67cb4fa14ac55f67b99a1e6f98595170d71cf54e
--- 1/src/zap.c
--- 2/src/zap.c
+++ b/src/zap.c
@@@ -1,5 -1,4 +1,4 @@@
 -/* NetHack 3.5        zap.c   $NHDT-Date: 1430172954 2015/04/27 22:15:54 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.218 $ */
 +/* NetHack 3.6        zap.c   $NHDT-Date: 1430355196 2015/04/30 00:53:16 $  $NHDT-Branch: master $:$NHDT-Revision: 1.218 $ */
- /* NetHack 3.6        zap.c   $Date: 2013/11/05 00:57:56 $  $Revision: 1.183 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */