diff options
| author | Micksha <Micksha@users.noreply.github.com> | 2018-10-21 20:04:19 +0200 |
|---|---|---|
| committer | Micksha <Micksha@users.noreply.github.com> | 2018-11-06 12:37:21 +0100 |
| commit | ca33512c446526a418669c96289371793d09d0fd (patch) | |
| tree | fd653315f89f31706ced456bb6e503f4f1555694 /items.xml | |
| parent | 9e0bdba0ea0f30537713a567ea39b05820b819d9 (diff) | |
| download | clientdata-ca33512c446526a418669c96289371793d09d0fd.tar.gz clientdata-ca33512c446526a418669c96289371793d09d0fd.tar.bz2 clientdata-ca33512c446526a418669c96289371793d09d0fd.tar.xz clientdata-ca33512c446526a418669c96289371793d09d0fd.zip | |
Add items for Melinda: Fine dress, beer
Diffstat (limited to 'items.xml')
| -rw-r--r-- | items.xml | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1014,10 +1014,16 @@ 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" |