diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2009-12-28 11:31:01 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-12-28 11:31:01 +1000 |
| commit | 09f88ea76c06d310aa4b68ca9336a2522e47e13f (patch) | |
| tree | 3f6cd25dcc4279464af774eef3630e54646c5cb7 /crawl-ref/source/rltiles | |
| parent | d5382a4e13ed6d6298ea4912c74454147d27f93a (diff) | |
| parent | b29345dd9d85fb18ec21ad19db53636a7bbf68e2 (diff) | |
| download | crawl-ref-09f88ea76c06d310aa4b68ca9336a2522e47e13f.tar.gz crawl-ref-09f88ea76c06d310aa4b68ca9336a2522e47e13f.zip | |
Merge branch 'master' into wizlab
Conflicts:
crawl-ref/source/rltiles/dc-mon.txt
Diffstat (limited to 'crawl-ref/source/rltiles')
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon.txt | 1 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/slave.png | bin | 0 -> 3395 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-mon/unique/maurice.png | bin | 902 -> 1080 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index ef0836c80b..b4a0c59fdf 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -339,6 +339,7 @@ vault_guard MONS_VAULT_GUARD shapeshifter MONS_SHAPESHIFTER glowing_shapeshifter MONS_GLOWING_SHAPESHIFTER killer_klown MONS_KILLER_KLOWN +slave MONS_SLAVE ## From the Wucad Mu wizlab human_monk_ghost MONS_HUMAN_MONK ## From the Cigotuvi wizlab diff --git a/crawl-ref/source/rltiles/dc-mon/slave.png b/crawl-ref/source/rltiles/dc-mon/slave.png Binary files differnew file mode 100644 index 0000000000..0f7e353e5c --- /dev/null +++ b/crawl-ref/source/rltiles/dc-mon/slave.png diff --git a/crawl-ref/source/rltiles/dc-mon/unique/maurice.png b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png Binary files differindex 284ad4645c..874963221c 100644 --- a/crawl-ref/source/rltiles/dc-mon/unique/maurice.png +++ b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png |
