diff options
| author | Wombat <hpwombat@yahoo.com> | 2010-12-07 13:46:55 -0500 |
|---|---|---|
| committer | Wombat <hpwombat@yahoo.com> | 2010-12-07 13:46:55 -0500 |
| commit | 2df3de68946c24ee0021eda5c72190b4b1fb392c (patch) | |
| tree | 6e47fb5b0f797bd6179e9f4914e9019228629730 /npcs.xml | |
| parent | 801ff5af67a839895f2ad2d9202d717b74169aef (diff) | |
| parent | 01e3fafbb54b2cbd43ba718715c2aea8c6b8d8ee (diff) | |
| download | clientdata-2df3de68946c24ee0021eda5c72190b4b1fb392c.tar.gz clientdata-2df3de68946c24ee0021eda5c72190b4b1fb392c.tar.bz2 clientdata-2df3de68946c24ee0021eda5c72190b4b1fb392c.tar.xz clientdata-2df3de68946c24ee0021eda5c72190b4b1fb392c.zip | |
Merge remote branch 'master/master'
Conflicts:
items.xml
monsters.xml
npcs.xml
Diffstat (limited to 'npcs.xml')
| -rw-r--r-- | npcs.xml | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -99,6 +99,7 @@ <npc id="185"><sprite variant="44">npcs/npc.xml</sprite><particlefx>graphics/particles/evilobelisk.particle.xml</particlefx></npc><!-- Evil Obelisk --> <npc id="186"><sprite variant="85">npcs/npc.xml</sprite></npc><!-- warning sign for pvp --> <npc id="187"><sprite variant="86">npcs/npc.xml</sprite></npc><!-- warning sign for pvp --> +<npc id="188"><sprite variant="87">npcs/npc.xml</sprite></npc><!-- Broken Skeleton (Hallowe'en 2010)--> <npc id="200"> <sprite>npcs/npc-test.xml</sprite> |