Merge branch 'master' into derek-farming

Reverse merge before final reintegration.

* master: (40 commits)
  Fix magic mapped dark room symbols
  Disclose extinct species alongside genocided ones
  ...

Conflicts:
	doc/fixes35.0
	src/do.c
	src/files.c
	src/invent.c
	src/objnam.c
	sys/share/pcmain.c

sys/share/pcmain.c

@@ -432,7 +432,7 @@ char *argv[];
         hackpid = 1;
 #endif
         write(fd, (genericptr_t) &hackpid, sizeof(hackpid));
-        close(fd);
+		nhclose(fd);
     }
 #ifdef MFLOPPY
     level_info[0].where = ACTIVE;