Index: ps/trunk/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/attack_slaughter.xml
@@ -6,9 +6,9 @@
   <props>
     <prop actor="props/units/weapons/knife.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/build.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/build.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/build.xml
@@ -4,10 +4,10 @@
     <animation event="0.5" file="biped/citizen/build.dae" name="Build" speed="100"/>
   </animations>
   <props>
+    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="weapon_L"/>
-    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/build_farm.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/build_farm.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/build_farm.xml
@@ -4,10 +4,10 @@
     <animation event="0.5" file="biped/citizen/build.dae" name="Build_farm" speed="100"/>
   </animations>
   <props>
+    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="weapon_L"/>
-    <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/carry_food.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/carry_food.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/carry_food.xml
@@ -9,9 +9,9 @@
     <prop actor="props/units/shuttle_basket_back.xml" attachpoint="back"/>
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/carry_meat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/carry_meat.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/carry_meat.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
     <prop actor="props/units/shuttle_meat_male_L.xml" attachpoint="weapon_L"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/carry_metal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/carry_metal.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/carry_metal.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_metal.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/carry_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/carry_stone.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/carry_stone.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_stone.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/carry_wood.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/carry_wood.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/carry_wood.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_wood.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
@@ -5,11 +5,11 @@
   </animations>
   <props>
     <prop actor="props/units/tools/basket_berries.xml" attachpoint="root"/>
-    <prop attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/gather_grain.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_grain.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_grain.xml
@@ -8,7 +8,7 @@
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/gather_meat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_meat.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_meat.xml
@@ -4,12 +4,11 @@
     <animation file="biped/gatherer/gather_meat.dae" name="gather_meat" speed="100"/>
   </animations>
   <props>
-    <prop actor="props/units/tools/basket_berries.xml" attachpoint="root"/>
     <prop actor="props/units/weapons/knife.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/gather_ore.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_ore.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_ore.xml
@@ -8,7 +8,7 @@
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/gather_rock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_rock.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_rock.xml
@@ -8,7 +8,7 @@
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
@@ -8,7 +8,7 @@
     <prop attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/gather_tree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_tree.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_tree.xml
@@ -8,7 +8,7 @@
     <prop attachpoint="weapon_R"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/carry_meat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/carry_meat.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/carry_meat.xml
@@ -6,7 +6,6 @@
   </animations>
   <props>
     <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield_arm"/>
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/gather_meat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/gather_meat.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/rider/camelry/gather_meat.xml
@@ -7,7 +7,6 @@
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
     <prop attachpoint="weapon_bow"/>
   </props>