diff options
| author | Micksha <Micksha@users.noreply.github.com> | 2018-10-22 11:45:20 +0200 |
|---|---|---|
| committer | Micksha <Micksha@users.noreply.github.com> | 2018-11-06 12:41:23 +0100 |
| commit | 5465010087eeb19536b858b16de0aa4afa2022d5 (patch) | |
| tree | 49c5edd108a602278697bb297270fe28fa43c0ff /items.xml | |
| parent | ca33512c446526a418669c96289371793d09d0fd (diff) | |
| download | clientdata-5465010087eeb19536b858b16de0aa4afa2022d5.tar.gz clientdata-5465010087eeb19536b858b16de0aa4afa2022d5.tar.bz2 clientdata-5465010087eeb19536b858b16de0aa4afa2022d5.tar.xz clientdata-5465010087eeb19536b858b16de0aa4afa2022d5.zip | |
remove skills from wrong branch, update items and NPCs (add Melinda), fix finedress for dying
Diffstat (limited to 'items.xml')
| -rw-r--r-- | items.xml | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -1014,16 +1014,10 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="equip-torso" weight="240" colors="simple" -<<<<<<< 9e0bdba0ea0f30537713a567ea39b05820b819d9 iconColors="simple" maxFloorOffset="10"> <sprite gender="unisex">equipment/chest/finedress-male.xml</sprite> <sprite gender="female">equipment/chest/finedress-female.xml</sprite> -======= - maxFloorOffset="10"> - <sprite gender="unisex">equipment/chest/finedress-male.xml|#606060,aaaaaa,dddddd,fcfcfc</sprite> - <sprite gender="female">equipment/chest/finedress-female.xml||#606060,aaaaaa,dddddd,fcfcfc</sprite> ->>>>>>> Add items for Melinda: Fine dress, beer </item> <item id="1309" image="equipment/chest/warlordplate.png" |