diff options
| -rw-r--r-- | graphics/items/equipment/chest/finedress.png | bin | 1328 -> 0 bytes | |||
| -rw-r--r-- | graphics/sprites/equipment/chest/finedress-female.png | bin | 61482 -> 0 bytes | |||
| -rw-r--r-- | graphics/sprites/equipment/chest/finedress-male.png | bin | 59311 -> 0 bytes | |||
| -rw-r--r-- | items.xml | 6 |
4 files changed, 6 insertions, 0 deletions
diff --git a/graphics/items/equipment/chest/finedress.png b/graphics/items/equipment/chest/finedress.png Binary files differdeleted file mode 100644 index af928f11..00000000 --- a/graphics/items/equipment/chest/finedress.png +++ /dev/null diff --git a/graphics/sprites/equipment/chest/finedress-female.png b/graphics/sprites/equipment/chest/finedress-female.png Binary files differdeleted file mode 100644 index a481f71a..00000000 --- a/graphics/sprites/equipment/chest/finedress-female.png +++ /dev/null diff --git a/graphics/sprites/equipment/chest/finedress-male.png b/graphics/sprites/equipment/chest/finedress-male.png Binary files differdeleted file mode 100644 index b2771257..00000000 --- a/graphics/sprites/equipment/chest/finedress-male.png +++ /dev/null @@ -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" |
