diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 20:24:07 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 20:24:07 +0530 |
| commit | 43d86ff397acfe79b6699845ae4e2ec9a8e485d0 (patch) | |
| tree | 72a76a5ed900aa4ab9465bef1cbd0d7807bbbccd /crawl-ref/source/dat | |
| parent | 3f8334b021c123a371f0dfe8062c3a84eebba673 (diff) | |
| parent | 8efdaf11a28299dda120a8afe78702686a6e2a47 (diff) | |
| download | crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.tar.gz crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.zip | |
Merge branch 'shoals++'
Diffstat (limited to 'crawl-ref/source/dat')
| -rw-r--r-- | crawl-ref/source/dat/descript/monsters.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index da05efc32f..579bbeb6a3 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -1048,7 +1048,19 @@ This tall and powerful demon is Mara, Lord of Illusions, mighty among dreamers. %%%% merfolk -Half fish, half man, the merfolk are citizens of both water and land, and they'll fiercely protect their chosen territory. +Half fish, half man, the merfolk are citizens of both water and land, and fierce protectors of their chosen territory. +%%%% +merfolk impaler + +A powerfully muscled merfolk warrior, bearing a great trident. +%%%% +merfolk aquamancer + +A slender merfolk mystic with unusually webby hands. Its form shifts and glistens as if seen through ocean spray. +%%%% +merfolk javelineer + +A sinewy merfolk fighter with a piercing gaze and a large bundle of javelins. %%%% mermaid |