pull in the recent unconditionals merge from master

This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 monattk.h $Date$ $Revision$ */
/* NetHack 3.5 monattk.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 monattk.h $Date: 2009/05/06 10:44:54 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)monattk.h 3.5 2002/03/24 */
/* NetHack may be freely redistributed. See license for details. */
/* Copyright 1988, M. Stephenson */
@@ -71,7 +72,6 @@
#define AD_DISE 33 /* confers diseases */
#define AD_DCAY 34 /* decays organics (brown Pudding) */
#define AD_SSEX 35 /* Succubus seduction (extended) */
/* If no SEDUCE then same as AD_SEDU */
#define AD_HALU 36 /* causes hallucination */
#define AD_DETH 37 /* for Death only */
#define AD_PEST 38 /* for Pestilence only */