summaryrefslogtreecommitdiff
path: root/graphics/sprites/equipment/head/brimmedhat.xml
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2018-07-21 20:11:54 +0200
committerMicksha <Micksha@users.noreply.github.com>2018-11-06 12:13:07 +0100
commit0c141539125edc1837fb3b6e3415e2369425ae2a (patch)
treefefcaa1d91cfa8d3f57a6665b5f3d8b38220f3a6 /graphics/sprites/equipment/head/brimmedhat.xml
parentd7c8544ba772c5dd80f8b07c3ec2cb37f9f6de61 (diff)
downloadclientdata-0c141539125edc1837fb3b6e3415e2369425ae2a.tar.gz
clientdata-0c141539125edc1837fb3b6e3415e2369425ae2a.tar.bz2
clientdata-0c141539125edc1837fb3b6e3415e2369425ae2a.tar.xz
clientdata-0c141539125edc1837fb3b6e3415e2369425ae2a.zip
Add a bunch of items converted by Saulc and his new head base sprite
Diffstat (limited to 'graphics/sprites/equipment/head/brimmedhat.xml')
-rw-r--r--graphics/sprites/equipment/head/brimmedhat.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/sprites/equipment/head/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml
index 3bce3a6e..4ecbe157 100644
--- a/graphics/sprites/equipment/head/brimmedhat.xml
+++ b/graphics/sprites/equipment/head/brimmedhat.xml
@@ -5,8 +5,12 @@ Copyright (C) 2014 Evol Online -->
<imageset name="base"
src="graphics/sprites/equipment/head/brimmedhat.png"
width="27"
+<<<<<<< HEAD
height="20"
offsetY="-10"/>
+=======
+ height="20"/>
+>>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df
<include file="equipment/head/pumpkinhat.xml"/>
</sprite>