summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-22 17:39:56 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-22 17:39:56 +0000
commitbb56017d36802fcf111bf79d8b758dca5fa99928 (patch)
tree61a5c2fc732258828fcf721e00d70d00476ef720
parent6741c094ccdf8e8585296dbf5e59ec17c9db8120 (diff)
parentc00d469a0cd2c9d5117b56229076ac9e56df711d (diff)
downloadclientdata-bb56017d36802fcf111bf79d8b758dca5fa99928.tar.gz
clientdata-bb56017d36802fcf111bf79d8b758dca5fa99928.tar.bz2
clientdata-bb56017d36802fcf111bf79d8b758dca5fa99928.tar.xz
clientdata-bb56017d36802fcf111bf79d8b758dca5fa99928.zip
Merge branch 'emo_pants_error' into 'master'
I'd really like the pants to be fixed already See merge request legacy/clientdata!535
-rw-r--r--monsters.xml2
m---------music0
2 files changed, 1 insertions, 1 deletions
diff --git a/monsters.xml b/monsters.xml
index 5315cabf..9ab5d143 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1587,7 +1587,7 @@
<sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle27.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
<sprite>equipment/chest/leather.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
- <sprite>equipment/legs/pants.png|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
+ <sprite>equipment/legs/pants.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
<sprite>equipment/head/shades.xml|#104010,208020,30c030</sprite>
<sprite>equipment/feet/boots.xml|#212121,555555</sprite>
<sprite>equipment/hands/generic.xml|#4e2e18,c8752f</sprite>
diff --git a/music b/music
-Subproject feb739ae5b4385829985b28e9e8dd2f4281d73e
+Subproject f84c61e6ac18ff8a6e19d21265ff8818169cac6