To resolve some of the pipeline errors

23 files changed, 43 insertions, 43 deletions

diff --git a/items/equip-torso.xml b/items/equip-torso.xml
index 5c8628c5..77174391 100644
--- a/items/equip-torso.xml
+++ b/items/equip-torso.xml
@@ -5383,7 +5383,7 @@
         type="equip-torso"
         defense="24"
         weight="2000">
-    <sprite gender="unisex">equipment/chest/saviorarmor-male.xml</sprite>
+    <sprite gender="unisex">equipment/chest/saviorarmor.xml</sprite>
     <sprite gender="female">equipment/chest/saviorarmor-female.xml</sprite>
   </item>
   <item id="546"
diff --git a/items/hairsprite/item-10_Shortandcurly.xml b/items/hairsprite/item-10_Shortandcurly.xml
index de490e20..d76e4f55 100644
--- a/items/hairsprite/item-10_Shortandcurly.xml
+++ b/items/hairsprite/item-10_Shortandcurly.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-10" type="hairsprite" name="Short and curly">
-    <sprite race="0" gender="male">hairstyles/hairstyle09-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle09-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle09.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle09.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle09-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle09-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle09.xml</sprite>
diff --git a/items/hairsprite/item-11_Pigtails.xml b/items/hairsprite/item-11_Pigtails.xml
index 1531aef5..39c2f324 100644
--- a/items/hairsprite/item-11_Pigtails.xml
+++ b/items/hairsprite/item-11_Pigtails.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-11" type="hairsprite" name="Pigtails">
-    <sprite race="0" gender="male">hairstyles/hairstyle10-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle10-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle10.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle10.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle10-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle10-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle10.xml</sprite>
diff --git a/items/hairsprite/item-12_Longandcurly.xml b/items/hairsprite/item-12_Longandcurly.xml
index 4757ae72..e4ef88f4 100644
--- a/items/hairsprite/item-12_Longandcurly.xml
+++ b/items/hairsprite/item-12_Longandcurly.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-12" type="hairsprite" name="Long and curly">
-    <sprite race="0" gender="male">hairstyles/hairstyle11-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle11-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle11.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle11.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle11-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle11-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle11.xml</sprite>
diff --git a/items/hairsprite/item-13_Parted.xml b/items/hairsprite/item-13_Parted.xml
index 67d0e80b..86d65db5 100644
--- a/items/hairsprite/item-13_Parted.xml
+++ b/items/hairsprite/item-13_Parted.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-13" type="hairsprite" name="Parted">
-    <sprite race="0" gender="male">hairstyles/hairstyle12-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle12-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle12.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle12.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle12-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle12-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle12.xml</sprite>
diff --git a/items/hairsprite/item-14_Perkyponytail.xml b/items/hairsprite/item-14_Perkyponytail.xml
index 206d5c2e..4d8d840f 100644
--- a/items/hairsprite/item-14_Perkyponytail.xml
+++ b/items/hairsprite/item-14_Perkyponytail.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-14" type="hairsprite" name="Perky ponytail">
-    <sprite race="0" gender="male">hairstyles/hairstyle13-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle13-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle13.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle13.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle13-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle13-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle13.xml</sprite>
diff --git a/items/hairsprite/item-15_Wave.xml b/items/hairsprite/item-15_Wave.xml
index eda358ef..5aca4a35 100644
--- a/items/hairsprite/item-15_Wave.xml
+++ b/items/hairsprite/item-15_Wave.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-15" type="hairsprite" name="Wave">
-    <sprite race="0" gender="male">hairstyles/hairstyle14-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle14-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle14.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle14.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle14-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle14-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle14.xml</sprite>
diff --git a/items/hairsprite/item-16_Mane.xml b/items/hairsprite/item-16_Mane.xml
index 4f4372f8..17b3465a 100644
--- a/items/hairsprite/item-16_Mane.xml
+++ b/items/hairsprite/item-16_Mane.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-16" type="hairsprite" name="Mane">
-    <sprite race="0" gender="male">hairstyles/hairstyle15-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle15-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle15.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle15.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle15-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle15-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle15.xml</sprite>
diff --git a/items/hairsprite/item-17_Bun.xml b/items/hairsprite/item-17_Bun.xml
index 8338c08b..f52738a8 100644
--- a/items/hairsprite/item-17_Bun.xml
+++ b/items/hairsprite/item-17_Bun.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-17" type="hairsprite" name="Bun">
-    <sprite race="0" gender="male">hairstyles/hairstyle16-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle16-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle16.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle16.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle16-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle16-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle16.xml</sprite>
diff --git a/items/hairsprite/item-18_Shoulderlengthflick.xml b/items/hairsprite/item-18_Shoulderlengthflick.xml
index 6f6b49f4..1aa25b9a 100644
--- a/items/hairsprite/item-18_Shoulderlengthflick.xml
+++ b/items/hairsprite/item-18_Shoulderlengthflick.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-18" type="hairsprite" name="Shoulder length flick">
-    <sprite race="0" gender="male">hairstyles/hairstyle17-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle17-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle17.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle17.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle17-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle17-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle17.xml</sprite>
diff --git a/items/hairsprite/item-19_Fizzy.xml b/items/hairsprite/item-19_Fizzy.xml
index 028c69d2..93aa9ea0 100644
--- a/items/hairsprite/item-19_Fizzy.xml
+++ b/items/hairsprite/item-19_Fizzy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-19" type="hairsprite" name="Fizzy">
-    <sprite race="0" gender="male">hairstyles/hairstyle18-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle18-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle18.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle18.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle18-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle18-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle18.xml</sprite>
diff --git a/items/hairsprite/item-1_Bald.xml b/items/hairsprite/item-1_Bald.xml
index c6627525..263b42f5 100644
--- a/items/hairsprite/item-1_Bald.xml
+++ b/items/hairsprite/item-1_Bald.xml
@@ -3,8 +3,8 @@
   <item id="-1" type="hairsprite" name="No style">
     <sprite race="2">hairstyles/hairstyle28.xml</sprite>
     <sprite race="3">hairstyles/hairstyle29.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle00-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle00-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle00.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle00.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle00-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle00-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle00.xml</sprite>
diff --git a/items/hairsprite/item-20_LongandClipped.xml b/items/hairsprite/item-20_LongandClipped.xml
index 52336b91..fdf78adf 100644
--- a/items/hairsprite/item-20_LongandClipped.xml
+++ b/items/hairsprite/item-20_LongandClipped.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-20" type="hairsprite" name="Long and Clipped">
-    <sprite race="0" gender="male">hairstyles/hairstyle19-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle19-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle19.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle19.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle19-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle19-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle19.xml</sprite>
diff --git a/items/hairsprite/item-2_Flatponytail.xml b/items/hairsprite/item-2_Flatponytail.xml
index c45f8444..4fda297e 100644
--- a/items/hairsprite/item-2_Flatponytail.xml
+++ b/items/hairsprite/item-2_Flatponytail.xml
@@ -3,8 +3,8 @@
   <item id="-2" type="hairsprite" name="Flat ponytail">
     <sprite race="2">hairstyles/hairstyle25.xml</sprite>
     <sprite race="3">hairstyles/hairstyle20.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle01-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle01-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle01.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle01.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle01-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle01-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle01.xml</sprite>
diff --git a/items/hairsprite/item-3_Bowlcut.xml b/items/hairsprite/item-3_Bowlcut.xml
index f1d76d8c..39b85ad6 100644
--- a/items/hairsprite/item-3_Bowlcut.xml
+++ b/items/hairsprite/item-3_Bowlcut.xml
@@ -3,8 +3,8 @@
   <item id="-3" type="hairsprite" name="Bowl cut">
     <sprite race="2">hairstyles/hairstyle26.xml</sprite>
     <sprite race="3">hairstyles/hairstyle21.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle02-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle02-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle02.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle02.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle02-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle02-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle02.xml</sprite>
diff --git a/items/hairsprite/item-4_Combedback.xml b/items/hairsprite/item-4_Combedback.xml
index 000b632a..0e27ece1 100644
--- a/items/hairsprite/item-4_Combedback.xml
+++ b/items/hairsprite/item-4_Combedback.xml
@@ -3,8 +3,8 @@
   <item id="-4" type="hairsprite" name="Combed back">
     <sprite race="2">hairstyles/hairstyle27.xml</sprite>
     <sprite race="3">hairstyles/hairstyle22.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle03-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle03-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle03.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle03.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle03-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle03-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle03.xml</sprite>
diff --git a/items/hairsprite/item-5_Emo.xml b/items/hairsprite/item-5_Emo.xml
index 14363483..4ab2a519 100644
--- a/items/hairsprite/item-5_Emo.xml
+++ b/items/hairsprite/item-5_Emo.xml
@@ -3,8 +3,8 @@
   <item id="-5" type="hairsprite" name="Emo">
     <sprite race="2">hairstyles/hairstyle30.xml</sprite>
     <sprite race="3">hairstyles/hairstyle23.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle04-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle04-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle04.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle04.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle04-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle04-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle04.xml</sprite>
diff --git a/items/hairsprite/item-6_Mohawk.xml b/items/hairsprite/item-6_Mohawk.xml
index 115e741d..7d046375 100644
--- a/items/hairsprite/item-6_Mohawk.xml
+++ b/items/hairsprite/item-6_Mohawk.xml
@@ -3,8 +3,8 @@
   <item id="-6" type="hairsprite" name="Mohawk">
     <sprite race="2">hairstyles/hairstyle31.xml</sprite>
     <sprite race="3">hairstyles/hairstyle24.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle05-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle05-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle05.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle05.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle05-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle05-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle05.xml</sprite>
diff --git a/items/hairsprite/item-7_Pompadour.xml b/items/hairsprite/item-7_Pompadour.xml
index 42084577..b3d99894 100644
--- a/items/hairsprite/item-7_Pompadour.xml
+++ b/items/hairsprite/item-7_Pompadour.xml
@@ -2,8 +2,8 @@
 <items>
   <item id="-7" type="hairsprite" name="Pompadour">
     <sprite race="2">hairstyles/hairstyle32.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle06-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle06-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle06.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle06.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle06-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle06-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle06.xml</sprite>
diff --git a/items/hairsprite/item-8_CenterpartingShortandslick.xml b/items/hairsprite/item-8_CenterpartingShortandslick.xml
index aff7d57d..f013d070 100644
--- a/items/hairsprite/item-8_CenterpartingShortandslick.xml
+++ b/items/hairsprite/item-8_CenterpartingShortandslick.xml
@@ -2,8 +2,8 @@
 <items>
   <item id="-8" type="hairsprite" name="Center parting/Short and slick">
     <sprite race="2">hairstyles/hairstyle33.xml</sprite>
-    <sprite race="0" gender="male">hairstyles/hairstyle07-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle07-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle07.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle07.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle07-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle07-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle07.xml</sprite>
diff --git a/items/hairsprite/item-9_Longandslick.xml b/items/hairsprite/item-9_Longandslick.xml
index 105f0085..4788ca11 100644
--- a/items/hairsprite/item-9_Longandslick.xml
+++ b/items/hairsprite/item-9_Longandslick.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <items>
   <item id="-9" type="hairsprite" name="Long and slick">
-    <sprite race="0" gender="male">hairstyles/hairstyle08-male.xml</sprite>
-    <sprite race="1" gender="male">hairstyles/hairstyle08-male.xml</sprite>
+    <sprite race="0" gender="male">hairstyles/hairstyle08.xml</sprite>
+    <sprite race="1" gender="male">hairstyles/hairstyle08.xml</sprite>
     <sprite race="0" gender="female">hairstyles/hairstyle08-female.xml</sprite>
     <sprite race="1" gender="female">hairstyles/hairstyle08-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle08.xml</sprite>
diff --git a/items/racesprite/item-100_Deprecated.xml b/items/racesprite/item-100_Deprecated.xml
index 24b78f12..aeac7a26 100644
--- a/items/racesprite/item-100_Deprecated.xml
+++ b/items/racesprite/item-100_Deprecated.xml
@@ -2,7 +2,7 @@
 <items>
   <item id="-100" type="racesprite" name="Talpan">
     <sprite gender="female">races/human-female.xml</sprite>
-    <sprite gender="male">races/human-male.xml</sprite>
+    <sprite gender="male">races/human.xml</sprite>
     <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
   </item>
   <item id="-99100" type="racesprite" name="Talpan">
diff --git a/items/racesprite/item-101_Talpan.xml b/items/racesprite/item-101_Talpan.xml
index e8bbfc30..b9bce0f3 100644
--- a/items/racesprite/item-101_Talpan.xml
+++ b/items/racesprite/item-101_Talpan.xml
@@ -2,7 +2,7 @@
 <items>
   <item id="-101" type="racesprite" name="Deprecated">
     <sprite gender="female">races/human-female.xml</sprite>
-    <sprite gender="male">races/human-male.xml</sprite>
+    <sprite gender="male">races/human.xml</sprite>
     <sprite gender="other">model/neutral.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
   </item>
   <item id="-99101" type="racesprite" name="Deprecated">