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

@@ -48,7 +48,7 @@ It is well known that wily shopkeepers raise their prices whene'er they
espy the garish apparel of the approaching tourist or the countenance of a
disfavored patron. They favor the gentle of manner and the fair of face.
The boor may expect unprofitable transactions.
----- SINKS
-----
The cliche of the kitchen sink swallowing any unfortunate rings that contact
its pernicious surface reflecteth greater truth than many homilies, yet
even so, few have developed the skill to identify enchanted rings by the
@@ -96,7 +96,7 @@ The gods are said to be pleased when offerings are given to the
priests who attend their temples, and they may grant various favors to
those who do so. But beware! To be young and frugal is better than to
be old and miserly.
----- ELBERETH
-----
The name of Elbereth may strike fear into the hearts of thine enemies, if
thou dost write it upon the ground at thy feet. If thou maintainest the
utmost calm, thy safety will be aided greatly, but beware lest thy clumsy