diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:00:12 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:00:12 +0000 |
commit | ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7 (patch) | |
tree | dbf6313bff2e2906a4f9ee61fdefff8594849522 /crawl-ref/source/acr.cc | |
parent | 0f8c8527e5a685509462e0990a7b6ec6595e445a (diff) | |
download | crawl-ref-ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7.tar.gz crawl-ref-ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7.zip |
Apply r6640, r6694 (both by Darshan), r6670 (Haran), r6679 and r6703
(me) to branch.
Includes TSO no longer granting permanent allies and resultant friendly
pickup change, and a number of smaller changes.
Also update change log.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6709 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r-- | crawl-ref/source/acr.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index ab1102eb24..849f754946 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1962,9 +1962,9 @@ void process_command( command_type cmd ) if (Options.tutorial_left && !god_gives_permanent_followers(you.religion)) { - mpr("Only intelligent, permanent allies may equip themselves, " - "which excludes all types of zombies as well as enslaved and " - "summoned monsters.", MSGCH_TUTORIAL); + mpr("Only intelligent allies may equip themselves, which excludes " + "all types of zombies as well as hostile monsters you " + "enslaved.", MSGCH_TUTORIAL); } mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ", |