diff options
| author | Bernhardt <orgzfrgh@gmail.com> | 2014-04-11 20:50:54 +0200 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2014-04-15 20:24:51 -0500 |
| commit | a69bdd775f290e27ee2181735f02d3c974808221 (patch) | |
| tree | 3dbbcc624b866660be84b519bf830a49c1bc77a9 /npcs.xml | |
| parent | bfecac213d29723571e27455c338c8e413844fed (diff) | |
| download | clientdata-a69bdd775f290e27ee2181735f02d3c974808221.tar.gz clientdata-a69bdd775f290e27ee2181735f02d3c974808221.tar.bz2 clientdata-a69bdd775f290e27ee2181735f02d3c974808221.tar.xz clientdata-a69bdd775f290e27ee2181735f02d3c974808221.zip | |
Playersprite 1.5
Icons for new equipment
All equipment spritesheet extended to more actions
Diffstat (limited to 'npcs.xml')
| -rw-r--r-- | npcs.xml | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -940,7 +940,14 @@ </npc> <!-- Blonde girl with spinning wheel by Chef Chelios--> <npc id="376"> +<<<<<<< HEAD <sprite>npcs/npc-weaver.xml</sprite> +======= + <sprite>races/talponian-female.xml</sprite> + <sprite>hairstyles/hairstyle11-female.xml|#dbd41e,867f1a,a49c2e,b2aa4f,c6c170,d9d394,e0dcb3</sprite> + <sprite>equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99;#FFF528</sprite> + <sprite variant="1">npcs/weaver-wheel.xml</sprite> +>>>>>>> 50ecfbb... mer </npc> <!-- Trapper --> <npc id="377"> |