Merge branch 'copperwater-hallutraps-3.7' into copperwater-3.7

diff --cc doc/fixes37.0
index 03c0b824ec6ec5fdf1ddbd00c24a378f2caf6bc0,43e042d957fa02742919a78af168b8b608bf3c1b..3f2c55378593f74440cd688bbba290f9645e487f
--- 1/doc/fixes37.0
--- 2/doc/fixes37.0
+++ b/doc/fixes37.0
@@@ -48,7 -48,7 +48,8 @@@ Platform- and/or Interface-Specific Ne
  
  NetHack Community Patches (or Variation) Included
  -------------------------------------------------
+ hallucinatory trap names from github pull request #174
 +autounlock feature originally from unnethack in github pull request #228
  
  
  Code Cleanup and Reorganization

diff --cc include/extern.h
Simple merge

diff --cc src/apply.c
Simple merge