diff --git a/assets/common/entity/wild/aggressive/dodarock.ron b/assets/common/entity/wild/aggressive/dodarock.ron
index db8c9630a8..822eb208b2 100644
--- a/assets/common/entity/wild/aggressive/dodarock.ron
+++ b/assets/common/entity/wild/aggressive/dodarock.ron
@@ -3,7 +3,7 @@
     name: Automatic,
     body: RandomWith("dodarock"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.creature.quad_small.dodarock"),
+    loot: LootTable("common.loot_tables.creature.theropod.dodarock"),
     inventory: (
         loadout: FromBody,
     ),
diff --git a/assets/common/loot_tables/creature/quad_small/dodarock.ron b/assets/common/loot_tables/creature/theropod/dodarock.ron
similarity index 100%
rename from assets/common/loot_tables/creature/quad_small/dodarock.ron
rename to assets/common/loot_tables/creature/theropod/dodarock.ron
diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron
index 54c843d971..d471f3bbe4 100644
--- a/assets/common/npc_names.ron
+++ b/assets/common/npc_names.ron
@@ -718,10 +718,6 @@
                 keyword: "quokka",
                 generic: "Quokka"
             ),
-            dodarock: (
-                keyword: "dodarock",
-                generic: "Dodarock"
-            ),
             holladon: (
                 keyword: "holladon",
                 generic: "Holladon"
@@ -989,7 +985,11 @@
             ntouka: (
                 keyword: "ntouka",
                 generic: "Ntouka"
-            )
+            ),
+            dodarock: (
+                keyword: "dodarock",
+                generic: "Dodarock"
+            ),
         )
     ),
     dragon: (
@@ -1143,6 +1143,22 @@
                 keyword: "wyvern_flame",
                 generic: "Flame Wyvern"
             ),
+            wyvern_cloud: (
+                keyword: "wyvern_cloud",
+                generic: "Cloud Wyvern"
+            ),
+            wyvern_frost: (
+                keyword: "wyvern_frost",
+                generic: "Frost Wyvern"
+            ),
+            wyvern_sea: (
+                keyword: "wyvern_sea",
+                generic: "Sea Wyvern"
+            ),
+            wyvern_weald: (
+                keyword: "wyvern_weald",
+                generic: "Weald Wyvern"
+            ),
         )
     ),
     quadruped_low: (
@@ -1185,6 +1201,14 @@
                 keyword: "rocksnapper",
                 generic: "Rock Snapper"
             ),
+            rootsnapper: (
+                keyword: "rootsnapper",
+                generic: "Root Snapper"
+            ),
+            reefsnapper: (
+                keyword: "reefsnapper",
+                generic: "Reef Snapper"
+            ),
             pangolin: (
                 keyword: "pangolin",
                 generic: "Pangolin"
diff --git a/assets/voxygen/voxel/bird_large_central_manifest.ron b/assets/voxygen/voxel/bird_large_central_manifest.ron
index 6617997b69..2a851fcf55 100644
--- a/assets/voxygen/voxel/bird_large_central_manifest.ron
+++ b/assets/voxygen/voxel/bird_large_central_manifest.ron
@@ -157,54 +157,262 @@
     ),
     (FlameWyvern, Male): (
         head: (
-            offset: (-5.5, -5.0, 0.0),
+            offset: (-7.5, -5.0, 0.0),
             central: ("npc.wyvern_flame.male.head"),
         ),
         beak: (
-            offset: (-2.5, 0.0, -5.0),
+            offset: (-6.5, 0.0, -7.0),
             central: ("npc.wyvern_flame.male.beak"),
         ),
         neck: (
-            offset: (-2.5, 0.0, -3.5),
+            offset: (-3.5, 0.0, -5.0),
             central: ("npc.wyvern_flame.male.neck"),
         ),
         chest: (
-            offset: (-6.5, -12.0, -9.0),
+            offset: (-8.5, -12.0, -10.0),
             central: ("npc.wyvern_flame.male.chest"),
         ),
         tail_front: (
-            offset: (-2.5, -12.0, -7.0),
+            offset: (-3.5, -12.0, -8.5),
             central: ("npc.wyvern_flame.male.tail_front"),
         ),
         tail_rear: (
-            offset: (-4.5, -29.0, -8.0),
+            offset: (-5.5, -27.0, -8.0),
             central: ("npc.wyvern_flame.male.tail_rear"),
         )
     ),
     (FlameWyvern, Female): (
         head: (
-            offset: (-5.5, -5.0, 0.0),
+            offset: (-7.5, -5.0, 0.0),
             central: ("npc.wyvern_flame.male.head"),
         ),
         beak: (
-            offset: (-2.5, 0.0, -5.0),
+            offset: (-6.5, 0.0, -7.0),
             central: ("npc.wyvern_flame.male.beak"),
         ),
         neck: (
-            offset: (-2.5, 0.0, -3.5),
+            offset: (-3.5, 0.0, -5.0),
             central: ("npc.wyvern_flame.male.neck"),
         ),
         chest: (
-            offset: (-6.5, -12.0, -9.0),
+            offset: (-8.5, -12.0, -10.0),
             central: ("npc.wyvern_flame.male.chest"),
         ),
         tail_front: (
-            offset: (-2.5, -12.0, -7.0),
+            offset: (-3.5, -12.0, -8.5),
             central: ("npc.wyvern_flame.male.tail_front"),
         ),
         tail_rear: (
-            offset: (-4.5, -29.0, -8.0),
+            offset: (-5.5, -27.0, -8.0),
             central: ("npc.wyvern_flame.male.tail_rear"),
         )
     ),
-})
+    (CloudWyvern, Male): (
+        head: (
+            offset: (-3.5, -5.0, 0.0),
+            central: ("npc.wyvern_cloud.male.head"),
+        ),
+        beak: (
+            offset: (-2.5, 0.0, -6.0),
+            central: ("npc.wyvern_cloud.male.beak"),
+        ),
+        neck: (
+            offset: (-2.5, 0.0, -5.0),
+            central: ("npc.wyvern_cloud.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_cloud.male.chest"),
+        ),
+        tail_front: (
+            offset: (-10.5, -14.0, -7.5),
+            central: ("npc.wyvern_cloud.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-11.5, -29.0, -7.0),
+            central: ("npc.wyvern_cloud.male.tail_rear"),
+        )
+    ),
+    (CloudWyvern, Female): (
+        head: (
+            offset: (-3.5, -5.0, 0.0),
+            central: ("npc.wyvern_cloud.male.head"),
+        ),
+        beak: (
+            offset: (-2.5, 0.0, -6.0),
+            central: ("npc.wyvern_cloud.male.beak"),
+        ),
+        neck: (
+            offset: (-2.5, 0.0, -5.0),
+            central: ("npc.wyvern_cloud.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_cloud.male.chest"),
+        ),
+        tail_front: (
+            offset: (-10.5, -14.0, -7.5),
+            central: ("npc.wyvern_cloud.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-11.5, -29.0, -7.0),
+            central: ("npc.wyvern_cloud.male.tail_rear"),
+        )
+    ),
+    (FrostWyvern, Male): (
+        head: (
+            offset: (-15.5, -5.0, 0.0),
+            central: ("npc.wyvern_frost.male.head"),
+        ),
+        beak: (
+            offset: (-2.5, 1.0, -5.0),
+            central: ("npc.wyvern_frost.male.beak"),
+        ),
+        neck: (
+            offset: (-3.5, 0.0, -5.0),
+            central: ("npc.wyvern_frost.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_frost.male.chest"),
+        ),
+        tail_front: (
+            offset: (-3.5, -12.0, -7.5),
+            central: ("npc.wyvern_frost.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-8.5, -26.0, -7.0),
+            central: ("npc.wyvern_frost.male.tail_rear"),
+        )
+    ),
+    (FrostWyvern, Female): (
+        head: (
+            offset: (-15.5, -5.0, 0.0),
+            central: ("npc.wyvern_frost.male.head"),
+        ),
+        beak: (
+            offset: (-2.5, 1.0, -5.0),
+            central: ("npc.wyvern_frost.male.beak"),
+        ),
+        neck: (
+            offset: (-3.5, 0.0, -5.0),
+            central: ("npc.wyvern_frost.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_frost.male.chest"),
+        ),
+        tail_front: (
+            offset: (-3.5, -12.0, -7.5),
+            central: ("npc.wyvern_frost.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-8.5, -26.0, -7.0),
+            central: ("npc.wyvern_frost.male.tail_rear"),
+        )
+    ),
+    (SeaWyvern, Male): (
+        head: (
+            offset: (-3.5, -2.0, 4.0),
+            central: ("npc.wyvern_sea.male.head"),
+        ),
+        beak: (
+            offset: (-3.5, 3.0, -3.0),
+            central: ("npc.wyvern_sea.male.beak"),
+        ),
+        neck: (
+            offset: (-3.5, -2.0, -6.0),
+            central: ("npc.wyvern_sea.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_sea.male.chest"),
+        ),
+        tail_front: (
+            offset: (-2.5, -13.0, -4.5),
+            central: ("npc.wyvern_sea.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-10.5, -39.0, -4.0),
+            central: ("npc.wyvern_sea.male.tail_rear"),
+        )
+    ),
+    (SeaWyvern, Female): (
+        head: (
+            offset: (-3.5, -2.0, 4.0),
+            central: ("npc.wyvern_sea.male.head"),
+        ),
+        beak: (
+            offset: (-3.5, 3.0, -3.0),
+            central: ("npc.wyvern_sea.male.beak"),
+        ),
+        neck: (
+            offset: (-3.5, -2.0, -6.0),
+            central: ("npc.wyvern_sea.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_sea.male.chest"),
+        ),
+        tail_front: (
+            offset: (-2.5, -13.0, -4.5),
+            central: ("npc.wyvern_sea.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-10.5, -39.0, -4.0),
+            central: ("npc.wyvern_sea.male.tail_rear"),
+        )
+    ),
+    (WealdWyvern, Male): (
+        head: (
+            offset: (-4.5, -7.0, 0.0),
+            central: ("npc.wyvern_weald.male.head"),
+        ),
+        beak: (
+            offset: (-2.5, 1.0, -9.0),
+            central: ("npc.wyvern_weald.male.beak"),
+        ),
+        neck: (
+            offset: (-2.5, 0.0, -2.0),
+            central: ("npc.wyvern_weald.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_weald.male.chest"),
+        ),
+        tail_front: (
+            offset: (-2.5, -12.0, -6.5),
+            central: ("npc.wyvern_weald.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-10.5, -34.0, -6.0),
+            central: ("npc.wyvern_weald.male.tail_rear"),
+        )
+    ),
+    (WealdWyvern, Female): (
+        head: (
+            offset: (-4.5, -7.0, 0.0),
+            central: ("npc.wyvern_weald.male.head"),
+        ),
+        beak: (
+            offset: (-2.5, 1.0, -9.0),
+            central: ("npc.wyvern_weald.male.beak"),
+        ),
+        neck: (
+            offset: (-2.5, 0.0, -2.0),
+            central: ("npc.wyvern_weald.male.neck"),
+        ),
+        chest: (
+            offset: (-6.5, -12.0, -10.0),
+            central: ("npc.wyvern_weald.male.chest"),
+        ),
+        tail_front: (
+            offset: (-2.5, -12.0, -6.5),
+            central: ("npc.wyvern_weald.male.tail_front"),
+        ),
+        tail_rear: (
+            offset: (-10.5, -34.0, -6.0),
+            central: ("npc.wyvern_weald.male.tail_rear"),
+        )
+    ),
+})
\ No newline at end of file
diff --git a/assets/voxygen/voxel/bird_large_lateral_manifest.ron b/assets/voxygen/voxel/bird_large_lateral_manifest.ron
index 0ea680f5eb..33b56d68d2 100644
--- a/assets/voxygen/voxel/bird_large_lateral_manifest.ron
+++ b/assets/voxygen/voxel/bird_large_lateral_manifest.ron
@@ -261,19 +261,19 @@
             lateral: ("npc.wyvern_flame.male.wing_in_r"),
         ),
         wing_mid_l: (
-            offset: (-17.0, -27.0, -2.0),
+            offset: (-17.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_mid_r"),
         ),
         wing_mid_r: (
-            offset: (0.0, -27.0, -2.0),
+            offset: (0.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_mid_r"),
         ),
         wing_out_l: (
-            offset: (-18.0, -27.0, -2.0),
+            offset: (-24.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_out_r"),
         ),
         wing_out_r: (
-            offset: (0.0, -27.0, -2.0),
+            offset: (-9.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_out_r"),
         ),
         leg_l: (
@@ -303,19 +303,19 @@
             lateral: ("npc.wyvern_flame.male.wing_in_r"),
         ),
         wing_mid_l: (
-            offset: (-17.0, -27.0, -2.0),
+            offset: (-17.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_mid_r"),
         ),
         wing_mid_r: (
-            offset: (0.0, -27.0, -2.0),
+            offset: (0.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_mid_r"),
         ),
         wing_out_l: (
-            offset: (-18.0, -27.0, -2.0),
+            offset: (-24.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_out_r"),
         ),
         wing_out_r: (
-            offset: (0.0, -27.0, -2.0),
+            offset: (-9.0, -26.5, -2.0),
             lateral: ("npc.wyvern_flame.male.wing_out_r"),
         ),
         leg_l: (
@@ -335,4 +335,340 @@
             lateral: ("npc.wyvern_flame.male.foot_r"),
         )
     ),
+    (CloudWyvern, Male): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_cloud.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_cloud.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-24.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (-9.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_cloud.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_cloud.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_cloud.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_cloud.male.foot_r"),
+        )
+    ),
+    (CloudWyvern, Female): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_cloud.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_cloud.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-24.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (-9.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_cloud.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_cloud.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_cloud.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_cloud.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_cloud.male.foot_r"),
+        )
+    ),
+    (FrostWyvern, Male): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_frost.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_frost.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-24.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (-9.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_frost.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_frost.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_frost.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_frost.male.foot_r"),
+        )
+    ),
+    (FrostWyvern, Female): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_frost.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_frost.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-24.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (-9.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_frost.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_frost.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.5, -5.0, -8.0),
+            lateral: ("npc.wyvern_frost.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_frost.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_frost.male.foot_r"),
+        )
+    ),
+    (SeaWyvern, Male): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_sea.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_sea.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-24.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (-9.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_sea.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_sea.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-5.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_sea.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_sea.male.foot_r"),
+        )
+    ),
+    (SeaWyvern, Female): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_sea.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_sea.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-24.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (-9.0, -26.5, -2.0),
+            lateral: ("npc.wyvern_sea.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_sea.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_sea.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-5.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_sea.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_sea.male.foot_r"),
+        )
+    ),
+   (WealdWyvern, Male): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_weald.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_weald.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -27.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -27.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-18.0, -23.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (0.0, -23.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_weald.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_weald.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_weald.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_weald.male.foot_r"),
+        )
+    ),
+    (WealdWyvern, Female): (
+        wing_in_l: (
+            offset: (-24.0, -9.0, -4.0),
+            lateral: ("npc.wyvern_weald.male.wing_in_r"),
+        ),
+        wing_in_r: (
+            offset: (0.0,  -9.0, -4.0),
+            lateral: ("npc.wyvern_weald.male.wing_in_r"),
+        ),
+        wing_mid_l: (
+            offset: (-17.0, -27.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_mid_r"),
+        ),
+        wing_mid_r: (
+            offset: (0.0, -27.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_mid_r"),
+        ),
+        wing_out_l: (
+            offset: (-18.0, -23.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_out_r"),
+        ),
+        wing_out_r: (
+            offset: (0.0, -23.0, -2.0),
+            lateral: ("npc.wyvern_weald.male.wing_out_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_weald.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-3.0, -4.5, -8.0),
+            lateral: ("npc.wyvern_weald.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_weald.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.5, -13.0),
+            lateral: ("npc.wyvern_weald.male.foot_r"),
+        )
+    ),
 })
\ No newline at end of file
diff --git a/assets/voxygen/voxel/golem_central_manifest.ron b/assets/voxygen/voxel/golem_central_manifest.ron
index 2d33f6636b..d872ec79c0 100644
--- a/assets/voxygen/voxel/golem_central_manifest.ron
+++ b/assets/voxygen/voxel/golem_central_manifest.ron
@@ -37,11 +37,11 @@
     ),
     (Treant, Male): (
         head: (
-            offset: (-6.0, -6.5, -0.0),
+            offset: (-6.0, -6.5, 5.0),
             central: ("npc.treant.male.head"),
         ),
         jaw: (
-            offset: (-4.0, 0.0, -3.0),
+            offset: (-7.0, 0.0, -3.0),
             central: ("npc.treant.male.jaw"),
         ),
         torso_upper: (
@@ -49,17 +49,17 @@
             central: ("npc.treant.male.chest_upper"),
         ),
         torso_lower: (
-            offset: (-8.0, -9.0, -8.0),
+            offset: (-8.0, -15.0, -10.0),
             central: ("npc.treant.male.chest_lower"),
         ),
     ),
     (Treant, Female): (
         head: (
-            offset: (-6.0, -6.5, -0.0),
+            offset: (-6.0, -6.5, 5.0),
             central: ("npc.treant.male.head"),
         ),
         jaw: (
-            offset: (-4.0, 0.0, -3.0),
+            offset: (-7.0, 0.0, -3.0),
             central: ("npc.treant.male.jaw"),
         ),
         torso_upper: (
@@ -67,7 +67,7 @@
             central: ("npc.treant.male.chest_upper"),
         ),
         torso_lower: (
-            offset: (-8.0, -9.0, -8.0),
+            offset: (-8.0, -15.0, -10.0),
             central: ("npc.treant.male.chest_lower"),
         ),
     ),
diff --git a/assets/voxygen/voxel/npc/dodarock/male/chest.vox b/assets/voxygen/voxel/npc/dodarock/male/chest.vox
deleted file mode 100644
index 59dc7b843a..0000000000
--- a/assets/voxygen/voxel/npc/dodarock/male/chest.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5b99efdd84befab454aaaece9ff2685da8316bfff3c7b02e8b57be75f5db943
-size 3608
diff --git a/assets/voxygen/voxel/npc/dodarock/male/chest_back.vox b/assets/voxygen/voxel/npc/dodarock/male/chest_back.vox
new file mode 100644
index 0000000000..dc7c917492
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/chest_back.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b17bf2859c9548c4fac4a97f1357cd05a608d9790bbdef9bbfbd5c84b45d058
+size 2128
diff --git a/assets/voxygen/voxel/npc/dodarock/male/chest_front.vox b/assets/voxygen/voxel/npc/dodarock/male/chest_front.vox
new file mode 100644
index 0000000000..2bae5c3f95
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/chest_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94ff469a56b59d0472b6f4c6466780ab05711d559d251ab125760006cee9485b
+size 2356
diff --git a/assets/voxygen/voxel/npc/dodarock/male/foot_br.vox b/assets/voxygen/voxel/npc/dodarock/male/foot_br.vox
deleted file mode 100644
index 689ab86790..0000000000
--- a/assets/voxygen/voxel/npc/dodarock/male/foot_br.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b6dad625318c31c13ca8c6a035877109e08a7e2c72ea1eff2d6155b47d4ec7b
-size 1252
diff --git a/assets/voxygen/voxel/npc/dodarock/male/foot_fr.vox b/assets/voxygen/voxel/npc/dodarock/male/foot_fr.vox
deleted file mode 100644
index 0129e65c20..0000000000
--- a/assets/voxygen/voxel/npc/dodarock/male/foot_fr.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:843dead8905b5b753843a55775a89b6f8b07a4fb94376ccfc6a032d7fdc448a7
-size 1552
diff --git a/assets/voxygen/voxel/npc/dodarock/male/foot_r.vox b/assets/voxygen/voxel/npc/dodarock/male/foot_r.vox
new file mode 100644
index 0000000000..71d729e5b7
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/foot_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c1c16f72a34a4cb2b0cbe7cf6cdf1c3789eb90afa16f8aa9837d6e3c36f61b5
+size 1476
diff --git a/assets/voxygen/voxel/npc/dodarock/male/hand_r.vox b/assets/voxygen/voxel/npc/dodarock/male/hand_r.vox
new file mode 100644
index 0000000000..fdcfc8bbf2
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/hand_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:672fa727cd9be27ca438540e955ee127c2aa1c44c472292e4d2f035b14b84e97
+size 1196
diff --git a/assets/voxygen/voxel/npc/dodarock/male/head.vox b/assets/voxygen/voxel/npc/dodarock/male/head.vox
index 04237a7cb1..654d77031b 100644
--- a/assets/voxygen/voxel/npc/dodarock/male/head.vox
+++ b/assets/voxygen/voxel/npc/dodarock/male/head.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d773d52265a88f9ff32f98506796235832f8fa5342ff19867aebf6e6e228791a
-size 3476
+oid sha256:b12c2c27d45ccbfa505409e7b1f729887fff5b3b63fe92a44fbfef8638ba90f5
+size 2072
diff --git a/assets/voxygen/voxel/npc/dodarock/male/head_lower.vox b/assets/voxygen/voxel/npc/dodarock/male/head_lower.vox
new file mode 100644
index 0000000000..8c0f49dd34
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/head_lower.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80d035b63d3948eddc3f8fee316bbea468160a9c8502965f9a06bbc1067915db
+size 1556
diff --git a/assets/voxygen/voxel/npc/dodarock/male/jaw.vox b/assets/voxygen/voxel/npc/dodarock/male/jaw.vox
new file mode 100644
index 0000000000..d568e39b39
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/jaw.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3131a4344c454b3b8854c3bc1c00f2c4572e5be713cd4daa974f85beb2e372e7
+size 2228
diff --git a/assets/voxygen/voxel/npc/dodarock/male/leg_r.vox b/assets/voxygen/voxel/npc/dodarock/male/leg_r.vox
new file mode 100644
index 0000000000..bad3e2b99d
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/leg_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fd1d8df616d6268e7f247924256ba2021876eb34dfc346063260ca66dcb2599
+size 1464
diff --git a/assets/voxygen/voxel/npc/dodarock/male/neck.vox b/assets/voxygen/voxel/npc/dodarock/male/neck.vox
new file mode 100644
index 0000000000..8c0f49dd34
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/neck.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80d035b63d3948eddc3f8fee316bbea468160a9c8502965f9a06bbc1067915db
+size 1556
diff --git a/assets/voxygen/voxel/npc/dodarock/male/tail_back.vox b/assets/voxygen/voxel/npc/dodarock/male/tail_back.vox
new file mode 100644
index 0000000000..c3f45a4d19
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/tail_back.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca163032b3811900101cda41dcf4b59a665dd542de97b9ac597758c82e17f07d
+size 2712
diff --git a/assets/voxygen/voxel/npc/dodarock/male/tail_front.vox b/assets/voxygen/voxel/npc/dodarock/male/tail_front.vox
new file mode 100644
index 0000000000..cc47b09a07
--- /dev/null
+++ b/assets/voxygen/voxel/npc/dodarock/male/tail_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3f7928ce9fc64f70254ae77e649bde5b80781bdddb176d3f4b0821f55cc7e1f
+size 1436
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/chest.vox b/assets/voxygen/voxel/npc/lavadrake/male/chest.vox
index 47e3cb22ab..ccb8c34bd0 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/chest.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/chest.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f3029c9a647b47b13cddaec53f30c437441e6269036db44eaef987713a4d943
+oid sha256:8c2c6b3875bedbac4773401f55d66d52a5c80d4a998025547315fd03dd6d7692
 size 13236
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/foot_br.vox b/assets/voxygen/voxel/npc/lavadrake/male/foot_br.vox
index 0e6e71ff5c..26aef4008d 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/foot_br.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/foot_br.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d237ea643dd4c25ab493a8cf8b089fd7ba708a40b26d32ac8545a1310c540a13
+oid sha256:bee4edd594b158d7b35af86af11d5b071da75574b09dd4280f71e8af937d78f5
 size 2284
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/foot_fr.vox b/assets/voxygen/voxel/npc/lavadrake/male/foot_fr.vox
index e36f0ed846..19ffe97cdd 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/foot_fr.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/foot_fr.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4e02a5d12aa6c7404147a10accb193b83c20c7a2a1eb9453cbfd3cd419f28da
+oid sha256:7177d78e479a261d96a24f842b30029db5af9bf85bc403ddd24474bd379df85c
 size 2748
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox b/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox
index e323389b25..84a5408012 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0efc717dc655bc9a269d18bb8f7f97d412d05cc9d004a288245d696d42c21d25
+oid sha256:f511ad916f4f96d6c5b74457ca05a3bf17667113ff51e8f34243f50bf462afe0
 size 3704
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox b/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox
index eed174a510..39d1bf85a6 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b91b537a022073269d475ecbd04b6050b702fda8a46d0bb7f3ee14f6cfd7de70
+oid sha256:9226365b7d239c2a68d03c1e9a01071d6a7699a608ce8841e0dbcb3aa6df73f2
 size 3676
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox b/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox
index 7bb1da4633..8441e6f399 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:322165ecfa95ce5b66e576c9f30d84227b946a6d1779bfb7273b036828a122da
+oid sha256:92e626dea6b686f88193b7b83015b82ca403fdde93527c9c277aca85e9221611
 size 1892
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox b/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox
index 528c02f781..70e7312c1b 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61606ad99db159a4842c64137cd7467360ce270af4f01e2cab29e754d53002bb
+oid sha256:705e630a7c39e40fd3ac7771c6697752a7bb0c15557c1a0a83f850a44c53a60f
 size 3476
diff --git a/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox b/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox
index 95f362bc41..77e4d6776f 100644
--- a/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox
+++ b/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:572d285f973d4bcd44a4e1a9bf118e8d0088b89e0f2ccee9a1fbefd3198510b3
+oid sha256:88fd6b1e4bc65f59b5de6518451b573b22ee7aa42d46d630e9eb36086637f4d3
 size 2592
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/chest.vox b/assets/voxygen/voxel/npc/reefsnapper/male/chest.vox
new file mode 100644
index 0000000000..50040d97a7
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/chest.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3298319049f68c60846aede4f6ec499655aecc470309c10392aeaea34916259
+size 27684
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/foot_br.vox b/assets/voxygen/voxel/npc/reefsnapper/male/foot_br.vox
new file mode 100644
index 0000000000..2d274c6130
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/foot_br.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88a779af4237045c4e33d72c0d54e5c4481a1e38a7803c1c73803d07beab675f
+size 2016
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/foot_fr.vox b/assets/voxygen/voxel/npc/reefsnapper/male/foot_fr.vox
new file mode 100644
index 0000000000..519e487117
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/foot_fr.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e62fce92e139290bd843604b0463286fc560f4db97bf420d97b8863bc0ec800
+size 2404
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/head_lower.vox b/assets/voxygen/voxel/npc/reefsnapper/male/head_lower.vox
new file mode 100644
index 0000000000..bcc798f2f6
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/head_lower.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcbff1ee9c2825e710638ec36bb70aeb8c59d5143b23abe44e46aaa91189f899
+size 2540
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/head_upper.vox b/assets/voxygen/voxel/npc/reefsnapper/male/head_upper.vox
new file mode 100644
index 0000000000..dfdd2c1438
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/head_upper.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69464dddb458f5062f99fb2d2e882409e5bef3ebdc611880f2e9acd9d7c91b12
+size 2040
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/jaw.vox b/assets/voxygen/voxel/npc/reefsnapper/male/jaw.vox
new file mode 100644
index 0000000000..b7c0fd104a
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/jaw.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:949595d1476617318ad71d720ef276355dd8db5c89d51a6079028c86b80567aa
+size 1868
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/tail_front.vox b/assets/voxygen/voxel/npc/reefsnapper/male/tail_front.vox
new file mode 100644
index 0000000000..fe6dc07eaa
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/tail_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97bdb83d5a69bfd2620ffc38b1c669ef7bf4358a8ac6e69c38c7cadd0b10ec59
+size 2128
diff --git a/assets/voxygen/voxel/npc/reefsnapper/male/tail_rear.vox b/assets/voxygen/voxel/npc/reefsnapper/male/tail_rear.vox
new file mode 100644
index 0000000000..fc9aa20c95
--- /dev/null
+++ b/assets/voxygen/voxel/npc/reefsnapper/male/tail_rear.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80d59dc17f0f14b279c3d6a5dadb5776627146e7c967f7261d432c05d98c4485
+size 1248
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/chest.vox b/assets/voxygen/voxel/npc/rootsnapper/male/chest.vox
new file mode 100644
index 0000000000..284575dd3c
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/chest.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2388f0dc532d57677083dbf4cdd54ae71324e7cedc4882d284b8b881038ce049
+size 44460
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/foot_br.vox b/assets/voxygen/voxel/npc/rootsnapper/male/foot_br.vox
new file mode 100644
index 0000000000..0f7d855470
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/foot_br.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4be24eedbea0b2ff576b77aa7316bf33e74cd8db16ed11f644471d3978fc550e
+size 2284
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/foot_fr.vox b/assets/voxygen/voxel/npc/rootsnapper/male/foot_fr.vox
new file mode 100644
index 0000000000..6bfecb59dc
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/foot_fr.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e61f0473792a68759255e1773af2122be9d56342b41c5ec3b6baffabe71681df
+size 3204
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/head_lower.vox b/assets/voxygen/voxel/npc/rootsnapper/male/head_lower.vox
new file mode 100644
index 0000000000..bc8e55074b
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/head_lower.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06eb7ed1c32b0223fe04333a2f45f93d601cb80933454681bde5c00a04c44cd2
+size 2808
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/head_upper.vox b/assets/voxygen/voxel/npc/rootsnapper/male/head_upper.vox
new file mode 100644
index 0000000000..908ad94bee
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/head_upper.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75fe5ad95729869db51ce220d61327914282fdea15538400748b843f48a0c570
+size 2424
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/jaw.vox b/assets/voxygen/voxel/npc/rootsnapper/male/jaw.vox
new file mode 100644
index 0000000000..3717a7d556
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/jaw.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b6c649037293f3e051a63589bb1c3f7a3586bd0812875ee3908558ff320a8ef
+size 1876
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/tail_front.vox b/assets/voxygen/voxel/npc/rootsnapper/male/tail_front.vox
new file mode 100644
index 0000000000..4e17c9e147
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/tail_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1eeb093567d930239511698c5597e95385ffbd8b7b20bfcf5fc89f4ae1bda54
+size 1940
diff --git a/assets/voxygen/voxel/npc/rootsnapper/male/tail_rear.vox b/assets/voxygen/voxel/npc/rootsnapper/male/tail_rear.vox
new file mode 100644
index 0000000000..e0f7645492
--- /dev/null
+++ b/assets/voxygen/voxel/npc/rootsnapper/male/tail_rear.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a67fd8e650e400b900a18714903b4b2bce19983b8302dff20f91b816e940f01c
+size 1300
diff --git a/assets/voxygen/voxel/npc/saber/male/ears.vox b/assets/voxygen/voxel/npc/saber/male/ears.vox
index 4aa1597ed0..792cb2b406 100644
--- a/assets/voxygen/voxel/npc/saber/male/ears.vox
+++ b/assets/voxygen/voxel/npc/saber/male/ears.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df2cadbe19870a3547e2a88d8e4a0d73e4392c45a78334a50dc1cd31843dbc55
+oid sha256:6308f1061ee63fab3dc8f239b7ecb9b5a08a27d8302739b1f863a004702f48f5
 size 1212
diff --git a/assets/voxygen/voxel/npc/saber/male/foot_br.vox b/assets/voxygen/voxel/npc/saber/male/foot_br.vox
index c34896d602..30f75b7f63 100644
--- a/assets/voxygen/voxel/npc/saber/male/foot_br.vox
+++ b/assets/voxygen/voxel/npc/saber/male/foot_br.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:924c16b464d9bf82ab4b4a29809c1c05ab310563ee47410783d6d57e0ed0fc80
-size 1452
+oid sha256:7a238b8b78b91075a79967566d897f43c21af21b9aa600ca46f35ec253c3a9dd
+size 1460
diff --git a/assets/voxygen/voxel/npc/saber/male/foot_fr.vox b/assets/voxygen/voxel/npc/saber/male/foot_fr.vox
index 64ec1e52fd..9abe71f241 100644
--- a/assets/voxygen/voxel/npc/saber/male/foot_fr.vox
+++ b/assets/voxygen/voxel/npc/saber/male/foot_fr.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae66cdfd498cc6ef8ddc97cf4a1b976e889b472d36a166c62e07602f2038d1ec
-size 1528
+oid sha256:8e11c9e5d7b2989d22717d0d1585c5801b0872794f6d8c00eff69d7af30bf009
+size 1636
diff --git a/assets/voxygen/voxel/npc/saber/male/head.vox b/assets/voxygen/voxel/npc/saber/male/head.vox
index 9ad5d724c5..84adbcca7c 100644
--- a/assets/voxygen/voxel/npc/saber/male/head.vox
+++ b/assets/voxygen/voxel/npc/saber/male/head.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d817c7c6f866fb22a83bbd05be19b5d310a7bdc2bc9b451a82110dcfd850fe9
-size 2836
+oid sha256:9133bfa04a804c81a6fe2d52e7fa8f2a32a9b3c03e4e7e38fc46812e70227353
+size 3004
diff --git a/assets/voxygen/voxel/npc/saber/male/jaw.vox b/assets/voxygen/voxel/npc/saber/male/jaw.vox
index 5ce073fb99..2a04349bb8 100644
--- a/assets/voxygen/voxel/npc/saber/male/jaw.vox
+++ b/assets/voxygen/voxel/npc/saber/male/jaw.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b25edc93bc79aabe51704e9d7e09b83d0df98a1dd0fbf2e65bc705eb4ef6027a
-size 1280
+oid sha256:8c7be1b22c6668d903ef80b5042afb6e807c8d23cb87075e1afaee5598c12e8c
+size 1312
diff --git a/assets/voxygen/voxel/npc/saber/male/leg_br.vox b/assets/voxygen/voxel/npc/saber/male/leg_br.vox
index 2970ddfcb4..fb478cbc8e 100644
--- a/assets/voxygen/voxel/npc/saber/male/leg_br.vox
+++ b/assets/voxygen/voxel/npc/saber/male/leg_br.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5f342f5578a6e8af4935720993419923f649a3f501cbf49c71ffbd8028523d6
-size 1480
+oid sha256:9e03b0b214d53cfc29bb938301d95edb37ffe0846bc114d9d0142770ed60e2f6
+size 1648
diff --git a/assets/voxygen/voxel/npc/saber/male/leg_fr.vox b/assets/voxygen/voxel/npc/saber/male/leg_fr.vox
index 78ca8f1f42..441c9d89e9 100644
--- a/assets/voxygen/voxel/npc/saber/male/leg_fr.vox
+++ b/assets/voxygen/voxel/npc/saber/male/leg_fr.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b63c1d176b76434ab14610cf7a42fa042dfb354d0cc507cae179bcaa68e15cec
-size 1616
+oid sha256:40d50bc2ffd27b55605c30389327429f5d0f4c2d4b858ee1c5a3ea3cfdc158ff
+size 1888
diff --git a/assets/voxygen/voxel/npc/saber/male/neck.vox b/assets/voxygen/voxel/npc/saber/male/neck.vox
index 17c9e6e952..a3e1b60d93 100644
--- a/assets/voxygen/voxel/npc/saber/male/neck.vox
+++ b/assets/voxygen/voxel/npc/saber/male/neck.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2f818308a97e33551efef0d8fe5f536f51cb118072ecf141f5c13fb29b5a507
-size 2456
+oid sha256:5b1f97e7024fd8cd04ba98a88ce6df5f3c0a79d12eea1201f45a8910c8a50d32
+size 2112
diff --git a/assets/voxygen/voxel/npc/saber/male/tail.vox b/assets/voxygen/voxel/npc/saber/male/tail.vox
index 46fcc59f8b..17a40351f7 100644
--- a/assets/voxygen/voxel/npc/saber/male/tail.vox
+++ b/assets/voxygen/voxel/npc/saber/male/tail.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b84e9aa06f9f1869683e1b79158a977b3fc444d230b0a15066d8d7a5e5bb0a20
-size 1304
+oid sha256:40410387249b9eb9893940b648be0f761a8d33b98d8624677fc0431939516cdf
+size 1352
diff --git a/assets/voxygen/voxel/npc/saber/male/torso_back.vox b/assets/voxygen/voxel/npc/saber/male/torso_back.vox
index 95606d2368..1b6f6edf07 100644
--- a/assets/voxygen/voxel/npc/saber/male/torso_back.vox
+++ b/assets/voxygen/voxel/npc/saber/male/torso_back.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9576a4a5d2c9ababecdff0f046f6469cde7f03c985e5b04d68e0cfb9f00e08a1
-size 4352
+oid sha256:3397f101981e9270ce36e3fca569abe9d7cb2567bf3ebac3d8cb77177bcbb241
+size 4584
diff --git a/assets/voxygen/voxel/npc/saber/male/torso_front.vox b/assets/voxygen/voxel/npc/saber/male/torso_front.vox
index 6eb955bddb..b6b2e0d298 100644
--- a/assets/voxygen/voxel/npc/saber/male/torso_front.vox
+++ b/assets/voxygen/voxel/npc/saber/male/torso_front.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2eed77cc8cfb3b21c5aad47dd5937cb0b3f4996d50456e97c7ef640a01dcd4e1
-size 5956
+oid sha256:10852b7dab6da3f1bdf7f2698e76ad2d7503851aa0218ceeacbf422693505451
+size 6860
diff --git a/assets/voxygen/voxel/npc/salamander/female/chest.vox b/assets/voxygen/voxel/npc/salamander/female/chest.vox
index 22af2b69a6..a58798bf77 100644
--- a/assets/voxygen/voxel/npc/salamander/female/chest.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/chest.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee51d809c2aca42f0c6fdc46027c9b33d0a95af75bf0a8579c16786a05a19031
-size 4696
+oid sha256:952fc49ba90cb07242e4164767a3c753ab74c5dead9d585b71d0dfd3e145a08f
+size 4536
diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_br.vox b/assets/voxygen/voxel/npc/salamander/female/foot_br.vox
index 3a5deefea3..0b4f1a8a0c 100644
--- a/assets/voxygen/voxel/npc/salamander/female/foot_br.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/foot_br.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cafe678aa536939f1a027d3c9c8b8f296cd3f535a70c56c5f72cbc802cdb6a56
-size 1260
+oid sha256:681c1b0501ab17079a4b018265950b7183524b6375ecaf63743069a5875df73f
+size 1244
diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox b/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox
index e68328e7ef..871875e0d7 100644
--- a/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab4a353c17629a085c23a6da38402af8ef642acb82d3324134300f9168512a8c
+oid sha256:139e71370808c38e82624e88d93ff691b4a573565424380107dfd2ffc51d6d90
 size 1268
diff --git a/assets/voxygen/voxel/npc/salamander/female/head_lower.vox b/assets/voxygen/voxel/npc/salamander/female/head_lower.vox
index 5f4102c45c..e80d87d18c 100644
--- a/assets/voxygen/voxel/npc/salamander/female/head_lower.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/head_lower.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bbb5fd2f36770cf69162a2da72e29b10c60f927235de56c7b0866359d19e861
-size 1608
+oid sha256:226483231a86635979bc382498ed2ed92178bad83d8d26b1ce3cd5a331ca9a07
+size 1616
diff --git a/assets/voxygen/voxel/npc/salamander/female/head_upper.vox b/assets/voxygen/voxel/npc/salamander/female/head_upper.vox
index 66e69ddf25..77b1ad274f 100644
--- a/assets/voxygen/voxel/npc/salamander/female/head_upper.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/head_upper.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f390e583f17db94502aee1ef20f786fee23e9688a41b81ca82d9a0d72356e21f
-size 3032
+oid sha256:23cf7b5d2fb775189ae73daac879dd14ae07b4a17e714cfa32bbc1c001eacebd
+size 2632
diff --git a/assets/voxygen/voxel/npc/salamander/female/jaw.vox b/assets/voxygen/voxel/npc/salamander/female/jaw.vox
index 365d8a4cca..f62946b658 100644
--- a/assets/voxygen/voxel/npc/salamander/female/jaw.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/jaw.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d87667aaf0f64890b0a2812dbb05bff6c103373399f47379c5905dd2a398fb81
-size 2040
+oid sha256:5daf93e147bcbf8909f0c4950b3c7cb77f8a4c900127cf3c7b0eeef092f119e2
+size 2240
diff --git a/assets/voxygen/voxel/npc/salamander/female/tail_front.vox b/assets/voxygen/voxel/npc/salamander/female/tail_front.vox
index 51d464df39..43042c8619 100644
--- a/assets/voxygen/voxel/npc/salamander/female/tail_front.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/tail_front.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d76e69b888e1aabc8628bcd5c369a2574e391b272161cdaa756c7699572631b
-size 1988
+oid sha256:837bc286eacc45aaad97aac778f5ecc024f2a298a98b40336a6b66a9e62857d2
+size 2276
diff --git a/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox b/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox
index 4c908e2b93..03779fcf66 100644
--- a/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox
+++ b/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80aeba8583353a90663ce83a2030d9599154ccecf397e47c6d22eff87c34e5dd
-size 2208
+oid sha256:0358f1adedfab8ba38e71daeded7b0bf8213e576607d1f121ca652cf73a73f1d
+size 1880
diff --git a/assets/voxygen/voxel/npc/treant/male/chest_lower.vox b/assets/voxygen/voxel/npc/treant/male/chest_lower.vox
index 92f5105e41..5c5cbb738c 100644
--- a/assets/voxygen/voxel/npc/treant/male/chest_lower.vox
+++ b/assets/voxygen/voxel/npc/treant/male/chest_lower.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3468c22115a2a404d5db97f8aa6cc09dde2cc6ede893c1533512885b526eee14
-size 3096
+oid sha256:b877cfca0001dffa15ebc8a93e3e45895d38c5f5e545c2b4c3664fdd509ea970
+size 4032
diff --git a/assets/voxygen/voxel/npc/treant/male/chest_upper.vox b/assets/voxygen/voxel/npc/treant/male/chest_upper.vox
index 968e931ac4..534a9ff220 100644
--- a/assets/voxygen/voxel/npc/treant/male/chest_upper.vox
+++ b/assets/voxygen/voxel/npc/treant/male/chest_upper.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1aaa561b55d39913f5a0e2e06b2fc3508baa8435a4a28db8e0f9040c5f35389a
-size 26440
+oid sha256:3f5c0efc375f29995b6b2d0a5c2cd15a8a6d2a77ad630176de221f595fb15e04
+size 29268
diff --git a/assets/voxygen/voxel/npc/treant/male/foot_l.vox b/assets/voxygen/voxel/npc/treant/male/foot_l.vox
index ea222ea030..dd5032bc38 100644
--- a/assets/voxygen/voxel/npc/treant/male/foot_l.vox
+++ b/assets/voxygen/voxel/npc/treant/male/foot_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fbd3555d9f86cffb2ece92386a4174b5faad584d00b4512eeb0c2ac70734656
-size 1652
+oid sha256:0d43d7934d99b0d0cfb6055e057570afb47f6f286df050d17182b897a2a286ca
+size 1704
diff --git a/assets/voxygen/voxel/npc/treant/male/foot_r.vox b/assets/voxygen/voxel/npc/treant/male/foot_r.vox
index db14bf1c13..24eea252e5 100644
--- a/assets/voxygen/voxel/npc/treant/male/foot_r.vox
+++ b/assets/voxygen/voxel/npc/treant/male/foot_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c02fe81fe3689e9bcb0cf077fb4bc2bed8a49c4c5c4791d9ca915e0a484fd367
-size 1652
+oid sha256:7e258471b7c573e658c45b60dad48013d937b06d876a452c03498ae02bcbf297
+size 1704
diff --git a/assets/voxygen/voxel/npc/treant/male/hand_l.vox b/assets/voxygen/voxel/npc/treant/male/hand_l.vox
index d2b1786bf0..6f97f0d901 100644
--- a/assets/voxygen/voxel/npc/treant/male/hand_l.vox
+++ b/assets/voxygen/voxel/npc/treant/male/hand_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b699568f0789cdd006db4770bb1b9be12c88aaf3ea63a37c5d917b68f1aea217
+oid sha256:76b2fc5b75c05b49a728b4a624975d26be1072d822a777fdcec164016b782b85
 size 4756
diff --git a/assets/voxygen/voxel/npc/treant/male/hand_r.vox b/assets/voxygen/voxel/npc/treant/male/hand_r.vox
index 05eb4dc8df..648dfab0a4 100644
--- a/assets/voxygen/voxel/npc/treant/male/hand_r.vox
+++ b/assets/voxygen/voxel/npc/treant/male/hand_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b812372fef96ff02b0f2664835ef15e998aca09ced35544ccdea26d55571acbc
+oid sha256:be3b472aa5e435fda9eba74bcce0c30c1b0b4213986950c98876d5efcaea4b11
 size 4748
diff --git a/assets/voxygen/voxel/npc/treant/male/head.vox b/assets/voxygen/voxel/npc/treant/male/head.vox
index fd3b18983d..7a715521d2 100644
--- a/assets/voxygen/voxel/npc/treant/male/head.vox
+++ b/assets/voxygen/voxel/npc/treant/male/head.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e57d5b9a067e79fccf9cc0ec1dded36bc63a40cd3ea217d595c3953e8bda064e
-size 2488
+oid sha256:40834cb9537dc5c6deba9156b15db248e143497967733b5efd3d5832cf4ea110
+size 3196
diff --git a/assets/voxygen/voxel/npc/treant/male/jaw.vox b/assets/voxygen/voxel/npc/treant/male/jaw.vox
index 259997c7ff..7d2674f1d7 100644
--- a/assets/voxygen/voxel/npc/treant/male/jaw.vox
+++ b/assets/voxygen/voxel/npc/treant/male/jaw.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d7357347b3493085b035132a48a864a9d0bcabf6945ea327ac948d5526e7ecb
-size 1656
+oid sha256:beb2ba9b754b430583a78fc690c4a0e27b59b5e9fc8a82ca352ea26bb47a6d33
+size 3032
diff --git a/assets/voxygen/voxel/npc/treant/male/leg_l.vox b/assets/voxygen/voxel/npc/treant/male/leg_l.vox
index 14e7a26fd1..2f8a63cb9a 100644
--- a/assets/voxygen/voxel/npc/treant/male/leg_l.vox
+++ b/assets/voxygen/voxel/npc/treant/male/leg_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5690058d4d4568694d14adedabaa17fec689b5243de283219190fe90c770841e
-size 1808
+oid sha256:743bd2cb4ba7e37701a147043fd86d9efb60b607b0d3cee0c46019bc2de973ad
+size 1864
diff --git a/assets/voxygen/voxel/npc/treant/male/leg_r.vox b/assets/voxygen/voxel/npc/treant/male/leg_r.vox
index 77e96dc05b..9653fad16a 100644
--- a/assets/voxygen/voxel/npc/treant/male/leg_r.vox
+++ b/assets/voxygen/voxel/npc/treant/male/leg_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8f68a8db8666159d8a9acd68de27f11606427aa0c517ce6e190a5bcbde6b9ab
-size 1808
+oid sha256:63ab0e3987864df9b7e605957acf04cd786b7c6067e58cba712bb944cb83740e
+size 1864
diff --git a/assets/voxygen/voxel/npc/treant/male/shoulder_l.vox b/assets/voxygen/voxel/npc/treant/male/shoulder_l.vox
index 9127b6df98..c2015bc7e1 100644
--- a/assets/voxygen/voxel/npc/treant/male/shoulder_l.vox
+++ b/assets/voxygen/voxel/npc/treant/male/shoulder_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ba4baf7f52faab77322eebedb6025441e9a204dc2550aca9fc64781085cbe1c
-size 4452
+oid sha256:9b78aa81a5b797219ee39b04e8cb1be67939cf2e7718e1635df680cfc7dee16f
+size 4356
diff --git a/assets/voxygen/voxel/npc/treant/male/shoulder_r.vox b/assets/voxygen/voxel/npc/treant/male/shoulder_r.vox
index 8e5a549192..53b50cbc67 100644
--- a/assets/voxygen/voxel/npc/treant/male/shoulder_r.vox
+++ b/assets/voxygen/voxel/npc/treant/male/shoulder_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67cfb2841a83d19216c3a2663a1718aa39d65a756af5f3fdf0ea80b12cd7b525
-size 4440
+oid sha256:0b261dc467ce5c1e16e237ce1c876b790ddbaa763728ca595282efb51a39c77b
+size 4304
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/beak.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/beak.vox
new file mode 100644
index 0000000000..29b41b4b5a
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/beak.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36d4f5e1ffe1aa92d5b7281031d905449d726a778e08ebbb71dc08fec431391f
+size 1664
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/chest.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/chest.vox
new file mode 100644
index 0000000000..be7807b9a1
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/chest.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ca2f5216c5ef407aacb26853e19365bd3ce265e9718388cd07be12bfd5949b9
+size 11548
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/foot_r.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/foot_r.vox
new file mode 100644
index 0000000000..445f8eeaf6
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/foot_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74633cff008be45f6d7a2d427e9a4e832b6d5617c40cfdce8b246240068d9f0f
+size 1960
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/head.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/head.vox
new file mode 100644
index 0000000000..2646211d41
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/head.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fcf64ed4deb991091813bd4bba16f9c581f0658440b4e57db1fa05148fd5a6c
+size 3116
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/jaw.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/jaw.vox
new file mode 100644
index 0000000000..29b41b4b5a
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/jaw.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36d4f5e1ffe1aa92d5b7281031d905449d726a778e08ebbb71dc08fec431391f
+size 1664
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/leg_r.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/leg_r.vox
new file mode 100644
index 0000000000..583771eb11
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/leg_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6867ea00968c2cc075b856a2663da8ae77e6517d3b7b06dceb96677421d1257
+size 2544
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/neck.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/neck.vox
new file mode 100644
index 0000000000..e677dca4ef
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/neck.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd4bdd666832d4701dc918dc5bc5ae0a9f0955fff384b78bbf0b39c8d863fa94
+size 2400
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/tail_front.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/tail_front.vox
new file mode 100644
index 0000000000..505f9cd048
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/tail_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5515f7a542bf02740b1588d5b82cdfc1a3c4848394d97d88d2a04cb35b22e11e
+size 3080
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/tail_rear.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/tail_rear.vox
new file mode 100644
index 0000000000..5d4cc3ffa6
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/tail_rear.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bee0e6df2eea6ad2b1a0b004f5f5b85c1634cec934dc2ba52d2542969468ead8
+size 3332
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_in_r.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_in_r.vox
new file mode 100644
index 0000000000..465a96ee57
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_in_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1b1bf9c52bba8cdc1419326a767c94b0d7f4ce4914749adef9551a0d936aec6
+size 3876
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_mid_r.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_mid_r.vox
new file mode 100644
index 0000000000..4ea599b420
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_mid_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:577b552b271b0bbd9b1f3dabde3a842634c74787f5c0dd27cd8aee447740d75e
+size 3828
diff --git a/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_out_r.vox b/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_out_r.vox
new file mode 100644
index 0000000000..a51807d374
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_cloud/male/wing_out_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48dc175fbc1d195687f4f59eeb9d748517358f36e29850b64f21990942a46fb5
+size 3748
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/beak.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/beak.vox
index a9e07d1f0f..bb36da471d 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/beak.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/beak.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd57daae57284d5361d2b06c998c3f795c35b552e3231fd8a6846f66d8f777b5
-size 1624
+oid sha256:08b91f1430ce53f7e7bc8f1317ae52bb3ba3c83870a5923fda9718e77bb408e8
+size 2724
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/chest.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/chest.vox
index dcdb4ad549..76917d567c 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/chest.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/chest.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42d64663c830e60c06b0d201914867c0afc3d1c065624a60df2360160f35ee73
-size 11124
+oid sha256:0d0c8e4e24ff929eb405b725730a6988f43642fb2425a419f0e9db408b66475d
+size 16808
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/foot_r.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/foot_r.vox
index 4b26f2e20d..7bd98dc25b 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/foot_r.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/foot_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:404b5d23587593f6b1dbadd51e9f4c68f7ffecaf35583a287bf5fa80934ec869
+oid sha256:62d1e811268040deee34ea2c91157dab43472c8251817f54e5d68903776179bb
 size 1960
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/head.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/head.vox
index f6f6116c95..33ef807a3d 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/head.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/head.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:913ebab8a33288051ce0813db2146f2b24dac63baebf608b59f5b1a231ebdd9c
-size 2704
+oid sha256:281a9d10819dfecc124f12da73a108beabce47fdf6d8bd47a00ef21d996fa690
+size 3340
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/leg_r.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/leg_r.vox
index 8aed222e76..4ca36c211b 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/leg_r.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/leg_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:751e1560b00f067c20cd3f6a56e82199d8eeddb8146b75fe6936dfa294f9651f
+oid sha256:5fc145966caa27b2f9a2ff1d1415b0dd90b29a4a2f9f74e7496cd431b14fa586
 size 2248
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/neck.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/neck.vox
index fc727abf14..c32a6ba38f 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/neck.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/neck.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39ee2a8f564263ff2291d45772e632b3076fc47f0c688ffb0fa5ef2ff7ce2e5c
-size 2132
+oid sha256:aca696a15deb4ee68f2b32e6d3026b4ebcff32410e34b21465c9fae2e991c5ff
+size 3372
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/tail_front.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/tail_front.vox
index a8d1bee79f..c027f78e44 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/tail_front.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/tail_front.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84ee697628508e55464a1f9f2a1740c772839c502423a688f8702114b102d20a
-size 2276
+oid sha256:e995dce09265b464ff30556f7435797b34bff31f51a66651b3889971240daa49
+size 2824
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/tail_rear.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/tail_rear.vox
index b8c7df970e..52cf3fe796 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/tail_rear.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/tail_rear.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b12d66a475a1b079d003bd7588320afeba1180f99900feef8cc8c80f120ce82
-size 2508
+oid sha256:60c9b5e8b7d2b98d8196b32461d0c3cbf92fd1a69f03b05c5c7fd64a9498826d
+size 3280
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/wing_in_r.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/wing_in_r.vox
index aedeb542ab..f5c08192ad 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/wing_in_r.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/wing_in_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15cfcfcf4633d8f25825c13ee81f0509075d0223b5a1e47fb082442da8bfb876
-size 3484
+oid sha256:336e23e84c580ed82267284d8d622bc3ab897fda4b8a2c50fc127d6996b43824
+size 3668
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/wing_mid_r.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/wing_mid_r.vox
index f680643bb4..83d87ec7ed 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/wing_mid_r.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/wing_mid_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc34faf908c37cde975c79610c05373fe75c81f8da54b9e7ed10ecd821731d1b
-size 2460
+oid sha256:fbf17f1f9d85002f655954be343bb6a282f02a8b7f3028e08f3b8e7b455fd95f
+size 2104
diff --git a/assets/voxygen/voxel/npc/wyvern_flame/male/wing_out_r.vox b/assets/voxygen/voxel/npc/wyvern_flame/male/wing_out_r.vox
index 99d22e1af9..fd4e3a091f 100644
--- a/assets/voxygen/voxel/npc/wyvern_flame/male/wing_out_r.vox
+++ b/assets/voxygen/voxel/npc/wyvern_flame/male/wing_out_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dd91e1e74eb978dbccef1b93d867a60667eca38dda161d1c92e0c56d9691d31
-size 1940
+oid sha256:25e1a73a12c91ab03b8b7c86859501f695c9d66844efa61e5ac8314f81212e98
+size 2240
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/beak.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/beak.vox
new file mode 100644
index 0000000000..03f4a504ac
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/beak.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a66389a46495c8e5b543663b336362449f354135c24c4e16ad6f9d3f1efa04f1
+size 1724
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/chest.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/chest.vox
new file mode 100644
index 0000000000..5becf4f21e
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/chest.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcde1b6649ba0bd63bef1d027c81ec2d5fc1d497f00ef43af6212b5cc541a929
+size 12116
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/foot_r.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/foot_r.vox
new file mode 100644
index 0000000000..b68bc0110b
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/foot_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bf1396dd870b8bdef3cebf38528daa64e15405cc8bf4d8f88699f127d6f74f5
+size 1960
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/head.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/head.vox
new file mode 100644
index 0000000000..bd7ff32418
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/head.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bed239a4e6eda14b5a18ef9ed212c1461ee3cf9f869a1682e25a28dc63e7b011
+size 3772
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/leg_r.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/leg_r.vox
new file mode 100644
index 0000000000..1d74f3ee86
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/leg_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bca3bef3d59a59d9ff44c34239fb11443dd575bd6b33b78ad66fc179cbe2115
+size 2260
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/neck.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/neck.vox
new file mode 100644
index 0000000000..06bf6145d9
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/neck.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d17e5093d23b33a36d54a08606f1b439ded0a80ba7ed5b25b932a4c9e7b263b1
+size 2764
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/tail_front.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/tail_front.vox
new file mode 100644
index 0000000000..dd98b5e27a
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/tail_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a367cf74aa48fa07582673f4cbe97a91f592a8c62c92cdc8a07fb761bd288ac8
+size 2776
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/tail_rear.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/tail_rear.vox
new file mode 100644
index 0000000000..306f004b2c
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/tail_rear.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a5c19d61ed86fe4188c1d015625accfe9fc16319ca16b5315f730b34793d306
+size 4100
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/wing_in_r.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/wing_in_r.vox
new file mode 100644
index 0000000000..ca07a6c5f5
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/wing_in_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da5cb479de2f9ccbc9e12f680948af6019e83867c789b3fb75951eea7bf7ce41
+size 3860
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/wing_mid_r.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/wing_mid_r.vox
new file mode 100644
index 0000000000..1215f9dfc2
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/wing_mid_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16b8f3d0c2713f2c3636d9dabdf805dfdf735f7a46ba80c19c66a5fbf073b9b8
+size 2316
diff --git a/assets/voxygen/voxel/npc/wyvern_frost/male/wing_out_r.vox b/assets/voxygen/voxel/npc/wyvern_frost/male/wing_out_r.vox
new file mode 100644
index 0000000000..09805722f8
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_frost/male/wing_out_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06b838348ca7c73661543e490aa0a24a8f734d3c6272f0d1657d5683d96f4e37
+size 2624
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/beak.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/beak.vox
new file mode 100644
index 0000000000..29514e77d6
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/beak.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5c280f923a9a009ba8db06ccd41d19b05ec25d55b7e85368f7637c9aa3d428a
+size 2144
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/chest.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/chest.vox
new file mode 100644
index 0000000000..da6ffe868d
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/chest.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b2059f03e96012dd27151e9ad0f00d9c0dfc3e47dced87526aed9e3e9c6f76a
+size 12068
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/foot_r.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/foot_r.vox
new file mode 100644
index 0000000000..41afab95e5
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/foot_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6f49b8af23bcbc40154bc0e82f7dfe191f00f2242b4acb609a2cf6c6402aa55
+size 2092
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/head.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/head.vox
new file mode 100644
index 0000000000..be0ea88ab7
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/head.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2baa9789cb5fa0be6f5b0c5a9c30d026200a5a24a551d237b047dcdaf6fdb66b
+size 3004
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/leg_r.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/leg_r.vox
new file mode 100644
index 0000000000..a77f197bb6
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/leg_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36cbb84bcebcb1dc11871637f1720c94439fee64d2b365063fa4df7631a2aa04
+size 2248
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/neck.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/neck.vox
new file mode 100644
index 0000000000..5df02d1fa4
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/neck.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfb89f8b4fcd185f2dab41aebe1c8eff10772e588c6a2c2a6e3311fd5bbe0049
+size 3660
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/tail_front.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/tail_front.vox
new file mode 100644
index 0000000000..ef8e3dbfb5
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/tail_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62d4e3df716dbe1f153df145c79bd05add27cd824d9225be80e8b2d089ad73d7
+size 2356
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/tail_rear.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/tail_rear.vox
new file mode 100644
index 0000000000..ad05de58ec
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/tail_rear.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:332a3444226802851ab078e8a771935075a4d0e9888f43d141eb2e40e56788f2
+size 3852
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/wing_in_r.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/wing_in_r.vox
new file mode 100644
index 0000000000..2426ce802c
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/wing_in_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fd9f8b2d06c3e8efa406cab6e9789ff907a24e03213e298327605c616177ae9
+size 3476
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/wing_mid_r.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/wing_mid_r.vox
new file mode 100644
index 0000000000..208b413876
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/wing_mid_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8ec9edc4cd1f0817225d2a0dbc464be512f07c32f867938d8e4925e5db3a7ee
+size 2308
diff --git a/assets/voxygen/voxel/npc/wyvern_sea/male/wing_out_r.vox b/assets/voxygen/voxel/npc/wyvern_sea/male/wing_out_r.vox
new file mode 100644
index 0000000000..5502f7eb7f
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_sea/male/wing_out_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2039c18fc80373a52b4120f338ac744f9fa1a5f54a282406b7509f44462ad0c1
+size 2352
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/beak.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/beak.vox
new file mode 100644
index 0000000000..205efdfbdf
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/beak.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3467e173ff3c4b8c6daa7e13e93093f9777d8350a22dad4adc591495cee324a8
+size 1872
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/chest.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/chest.vox
new file mode 100644
index 0000000000..477bbf2ec4
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/chest.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02acba132a049f4cc599f83f7d8305027d06ca60855a22194f15385473fbc18b
+size 11276
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/foot_r.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/foot_r.vox
new file mode 100644
index 0000000000..454ae00303
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/foot_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d75d02b8246ac85e6d0a4e158d2eea244ef17111c221f842ecc13461e7413a18
+size 2112
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/head.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/head.vox
new file mode 100644
index 0000000000..f058530430
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/head.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72a759b362eb1bb2988d2fa7df57b93328b014380bb5e35a396d761519aa5173
+size 3028
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/leg_r.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/leg_r.vox
new file mode 100644
index 0000000000..225b8f40ac
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/leg_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4008d8048b4647f9aa11b4170c4a494a551eef04adf13f347c7f0aed3b959117
+size 2244
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/neck.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/neck.vox
new file mode 100644
index 0000000000..40d05f8230
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/neck.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85c639b56db17176db78fa420534c7e83aeee34ee0a976d8c84a756aa14ec3e6
+size 2344
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/tail_front.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/tail_front.vox
new file mode 100644
index 0000000000..ce86690d03
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/tail_front.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b430134eb040c0fe28a08c4d80174396c62556e89eb4fcd6677ee52b2d96550f
+size 2420
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/tail_rear.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/tail_rear.vox
new file mode 100644
index 0000000000..a51895efb2
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/tail_rear.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76e45465860d5e6f2efb02d1f6b3e64982513432447033b3fea5259f26ad01e6
+size 3492
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/wing_in_r.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/wing_in_r.vox
new file mode 100644
index 0000000000..471b00fe89
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/wing_in_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3afd6c3858aa82449ba76ee343d774c46b98fb3cd467b43c78baf6f7bd343702
+size 3416
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/wing_mid_r.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/wing_mid_r.vox
new file mode 100644
index 0000000000..b8b3154ab1
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/wing_mid_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfe7415a1e44710b14bb9900558fa3b2439743bf89f50590de91c0f486de65e6
+size 3104
diff --git a/assets/voxygen/voxel/npc/wyvern_weald/male/wing_out_r.vox b/assets/voxygen/voxel/npc/wyvern_weald/male/wing_out_r.vox
new file mode 100644
index 0000000000..554e6b4101
--- /dev/null
+++ b/assets/voxygen/voxel/npc/wyvern_weald/male/wing_out_r.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d152dd57ac2dfc432206fa9faf43e33ff5adbd0176f9172df74e9da7dc727eb9
+size 2384
diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron
index c1d95b2214..5390e20698 100644
--- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron
@@ -183,23 +183,23 @@
     ),
     (Salamander, Female): (
         upper: (
-            offset: (-9.5, 0.0, -2.0),
+            offset: (-6.5, 0.0, -2.0),
             central: ("npc.salamander.female.head_upper"),
         ),
         lower: (
-            offset: (-4.5, -1.5, -3.0),
+            offset: (-4.5, -2.0, -3.0),
             central: ("npc.salamander.female.head_lower"),
         ),
         jaw: (
-            offset: (-6.5, 0.0, -2.0),
+            offset: (-6.5, 0.0, -3.5,),
             central: ("npc.salamander.female.jaw"),
         ),
         chest: (
-            offset: (-8.5, -8.5, -3.0),
+            offset: (-6.5, -8.5, -3.0),
             central: ("npc.salamander.female.chest"),
         ),
         tail_rear: (
-            offset: (-6.5, -13.0, -2.5),
+            offset: (-3.5, -13.0, -2.5),
             central: ("npc.salamander.female.tail_rear"),
         ),
 		tail_front: (
@@ -416,6 +416,110 @@
             central: ("npc.rocksnapper.male.tail_front"),
         ),
     ),
+    (Rootsnapper, Male): (
+        upper: (
+            offset: (-3.5, -3.5, 3.0),
+            central: ("npc.rootsnapper.male.head_upper"),
+        ),
+        lower: (
+            offset: (-3.5, -4.0, 0.5),
+            central: ("npc.rootsnapper.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-3.5, 3.0, 5.0),
+            central: ("npc.rootsnapper.male.jaw"),
+        ),
+        chest: (
+            offset: (-12.5, -17.0, -17.5),
+            central: ("npc.rootsnapper.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-1.5, -5.0, -2.5),
+            central: ("npc.rootsnapper.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-2.5, -12.0, -5.5),
+            central: ("npc.rootsnapper.male.tail_front"),
+        ),
+    ),
+    (Rootsnapper, Female): (
+        upper: (
+            offset: (-3.5, -3.5, 3.0),
+            central: ("npc.rootsnapper.male.head_upper"),
+        ),
+        lower: (
+            offset: (-3.5, -4.0, 0.5),
+            central: ("npc.rootsnapper.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-3.5, 3.0, 5.0),
+            central: ("npc.rootsnapper.male.jaw"),
+        ),
+        chest: (
+            offset: (-12.5, -17.0, -17.5),
+            central: ("npc.rootsnapper.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-1.5, -5.0, -2.5),
+            central: ("npc.rootsnapper.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-2.5, -12.0, -5.5),
+            central: ("npc.rootsnapper.male.tail_front"),
+        ),
+    ),
+    (Reefsnapper, Male): (
+        upper: (
+            offset: (-3.5, 1.5, -4.0),
+            central: ("npc.reefsnapper.male.head_upper"),
+        ),
+        lower: (
+            offset: (-3.5, -1.0, -6.0),
+            central: ("npc.reefsnapper.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-4.5, 7.0, -5.0),
+            central: ("npc.reefsnapper.male.jaw"),
+        ),
+        chest: (
+            offset: (-13.5, -15.0, -15.5),
+            central: ("npc.reefsnapper.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-3.5, -8.0, -5.5),
+            central: ("npc.reefsnapper.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-4.5, -15.0, -7.5),
+            central: ("npc.reefsnapper.male.tail_front"),
+        ),
+    ),
+    (Reefsnapper, Female): (
+        upper: (
+            offset: (-3.5, 1.5, -4.0),
+            central: ("npc.reefsnapper.male.head_upper"),
+        ),
+        lower: (
+            offset: (-3.5, -1.0, -6.0),
+            central: ("npc.reefsnapper.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-4.5, 7.0, -5.0),
+            central: ("npc.reefsnapper.male.jaw"),
+        ),
+        chest: (
+            offset: (-13.5, -15.0, -15.5),
+            central: ("npc.reefsnapper.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-3.5, -8.0, -5.5),
+            central: ("npc.reefsnapper.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-4.5, -15.0, -7.5),
+            central: ("npc.reefsnapper.male.tail_front"),
+        ),
+    ),
     (Pangolin, Male): (
         upper: (
             offset: (-2.5, 0.0, -3.0),
diff --git a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron
index 26e1b3a8b8..5a43cf79aa 100644
--- a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron
@@ -135,7 +135,7 @@
             lateral: ("npc.salamander.female.foot_fr", false),
         ),
         back_left: (
-            offset: (-8.0, 0.0, -3.0),
+            offset: (-7.5, 0.0, -3.0),
             lateral: ("npc.salamander.female.foot_br", false),
         ),
         back_right: (
@@ -287,6 +287,78 @@
             lateral: ("npc.rocksnapper.male.foot_br", false),
         ),
     ),
+    (Rootsnapper, Male): (
+        front_left: (
+            offset: (-12.0, -1.0, -10.0),
+            lateral: ("npc.rootsnapper.male.foot_fr", false),
+        ),
+        front_right: (
+            offset: (0.0, -1.0, -10.0),
+            lateral: ("npc.rootsnapper.male.foot_fr", false),
+        ),
+        back_left: (
+            offset: (-11.0, -5.0, -9.0),
+            lateral: ("npc.rootsnapper.male.foot_br", false),
+        ),
+        back_right: (
+            offset: (0.0, -5.0, -9.0),
+            lateral: ("npc.rootsnapper.male.foot_br", false),
+        ),
+    ),
+    (Rootsnapper, Female): (
+        front_left: (
+            offset: (-12.0, -1.0, -10.0),
+            lateral: ("npc.rootsnapper.male.foot_fr", false),
+        ),
+        front_right: (
+            offset: (0.0, -1.0, -10.0),
+            lateral: ("npc.rootsnapper.male.foot_fr", false),
+        ),
+        back_left: (
+            offset: (-11.0, -5.0, -9.0),
+            lateral: ("npc.rootsnapper.male.foot_br", false),
+        ),
+        back_right: (
+            offset: (0.0, -5.0, -9.0),
+            lateral: ("npc.rootsnapper.male.foot_br", false),
+        ),
+    ),
+    (Reefsnapper, Male): (
+        front_left: (
+            offset: (-12.0, 0.0, -10.0),
+            lateral: ("npc.reefsnapper.male.foot_fr", false),
+        ),
+        front_right: (
+            offset: (-3.0, 0.0, -10.0),
+            lateral: ("npc.reefsnapper.male.foot_fr", false),
+        ),
+        back_left: (
+            offset: (-11.0, -7.0, -9.0),
+            lateral: ("npc.reefsnapper.male.foot_br", false),
+        ),
+        back_right: (
+            offset: (0.0, -7.0, -9.0),
+            lateral: ("npc.reefsnapper.male.foot_br", false),
+        ),
+    ),
+    (Reefsnapper, Female): (
+        front_left: (
+            offset: (-12.0, 0.0, -10.0),
+            lateral: ("npc.reefsnapper.male.foot_fr", false),
+        ),
+        front_right: (
+            offset: (-3.0, 0.0, -10.0),
+            lateral: ("npc.reefsnapper.male.foot_fr", false),
+        ),
+        back_left: (
+            offset: (-11.0, -7.0, -9.0),
+            lateral: ("npc.reefsnapper.male.foot_br", false),
+        ),
+        back_right: (
+            offset: (0.0, -7.0, -9.0),
+            lateral: ("npc.reefsnapper.male.foot_br", false),
+        ),
+    ),
     (Pangolin, Male): (
         front_left: (
             offset: (-1.5, 0.0, -6.0),//unique
diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
index 74d0b82cf8..58a87f3988 100644
--- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
@@ -61,15 +61,15 @@
     ),
     (Saber, Male): (
         head: (
-            offset: (-5.5, 0.0, -6.5),
+            offset: (-6.5, 0.5, -6.5),
             central: ("npc.saber.male.head"),
         ),
         neck: (
-            offset: (-4.0, -2.0, -4.0),
+            offset: (-4.0, 1.0, -3.0),
             central: ("npc.saber.male.neck"),
         ),
         jaw: (
-            offset: (-2.5, 0.0, -1.5),
+            offset: (-2.5, 2.0, -1.5),
             central: ("npc.saber.male.jaw"),
         ),
         torso_front: (
@@ -77,29 +77,29 @@
             central: ("npc.saber.male.torso_front"),
         ),
         torso_back: (
-            offset: (-5.0, -12.0, -5.0),
+            offset: (-5.0, -11.5, -8.0),
             central: ("npc.saber.male.torso_back"),
         ),
         ears: (
-            offset: (-5.5, -1.0, 0.0),
+            offset: (-5.0, -2.0, 0.0),
             central: ("npc.saber.male.ears"),
         ),
         tail: (
-            offset: (-2.0, -8.0, -5.0),
+            offset: (-2.0, -7.0, -6.0),
             central: ("npc.saber.male.tail"),
         ),
     ),
     (Saber, Female): (
         head: (
-            offset: (-5.5, 0.0, -6.5),
+            offset: (-6.5, 0.5, -6.5),
             central: ("npc.saber.male.head"),
         ),
         neck: (
-            offset: (-4.0, -2.0, -4.0),
+            offset: (-4.0, 1.0, -3.0),
             central: ("npc.saber.male.neck"),
         ),
         jaw: (
-            offset: (-2.5, 0.0, -1.5),
+            offset: (-2.5, 2.0, -1.5),
             central: ("npc.saber.male.jaw"),
         ),
         torso_front: (
@@ -107,15 +107,15 @@
             central: ("npc.saber.male.torso_front"),
         ),
         torso_back: (
-            offset: (-5.0, -12.0, -5.0),
+            offset: (-5.0, -11.5, -8.0),
             central: ("npc.saber.male.torso_back"),
         ),
         ears: (
-            offset: (-5.5, -1.0, 0.0),
+            offset: (-5.0, -2.0, 0.0),
             central: ("npc.saber.male.ears"),
         ),
         tail: (
-            offset: (-2.0, -8.0, -5.0),
+            offset: (-2.0, -7.0, -6.0),
             central: ("npc.saber.male.tail"),
         ),
     ),
diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
index 5594d88959..f1a1bb3c90 100644
--- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
@@ -69,19 +69,19 @@
     ),
     (Saber, Male): (
         leg_fl: (
-            offset: (-2.0, -6.0, -4.5),
+            offset: (-2.0, -10.0, -4.5),
             lateral: ("npc.saber.male.leg_fr"),
         ),
         leg_fr: (
-            offset: (-2.0, -6.0, -4.5),
+            offset: (-2.0, -10.0, -4.5),
             lateral: ("npc.saber.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.0, -4.0),
+            offset: (-2.0, -5.0, -4.0),
             lateral: ("npc.saber.male.leg_br"),
         ),
         leg_br: (
-            offset: (-2.0, -3.0, -4.0),
+            offset: (-2.0, -5.0, -4.0),
             lateral: ("npc.saber.male.leg_br"),
         ),
         foot_fl: (
@@ -103,19 +103,19 @@
     ),
     (Saber, Female): (
         leg_fl: (
-            offset: (-2.0, -6.0, -4.5),
+            offset: (-2.0, -10.0, -4.5),
             lateral: ("npc.saber.male.leg_fr"),
         ),
         leg_fr: (
-            offset: (-2.0, -6.0, -4.5),
+            offset: (-2.0, -10.0, -4.5),
             lateral: ("npc.saber.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.0, -4.0),
+            offset: (-2.0, -5.0, -4.0),
             lateral: ("npc.saber.male.leg_br"),
         ),
         leg_br: (
-            offset: (-2.0, -3.0, -4.0),
+            offset: (-2.0, -5.0, -4.0),
             lateral: ("npc.saber.male.leg_br"),
         ),
         foot_fl: (
diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron
index dd13227ab7..37a5fbfd8d 100644
--- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron
@@ -279,34 +279,6 @@
             central: ("npc.quokka.male.tail"),
         ),
     ),
-    (Dodarock, Male):(
-        head: (
-            offset: (-4.5, 0.0, -2.5),
-            central: ("npc.dodarock.male.head"),
-        ),
-        chest: (
-            offset: (-4.5, -8.0, -4.5),
-            central: ("npc.dodarock.male.chest"),
-        ),
-        tail: (
-            offset: (-1.5, -7.5, -2.5),
-            central: ("armor.empty"),
-        ),
-    ),
-    (Dodarock, Female):(
-        head: (
-            offset: (-4.5, 0.0, -2.5),
-            central: ("npc.dodarock.male.head"),
-        ),
-        chest: (
-            offset: (-4.5, -8.0, -4.5),
-            central: ("npc.dodarock.male.chest"),
-        ),
-        tail: (
-            offset: (-1.5, -7.5, -2.5),
-            central: ("armor.empty"),
-        ),
-    ),
     (Holladon, Male):(
         head: (
             offset: (-3.5, 0.0, -4.0),
diff --git a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron
index f11040990d..8313cb5233 100644
--- a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron
@@ -361,42 +361,6 @@
             lateral: ("npc.quokka.male.foot_br"),
         ),
     ),
-    (Dodarock, Male): (
-        left_front: (
-            offset: (-2.0, -3.0, -6.5),
-            lateral: ("npc.dodarock.male.foot_fr"),
-        ),
-        right_front: (
-            offset: (-2.0, -3.0, -6.5),
-            lateral: ("npc.dodarock.male.foot_fr"),
-        ),
-        left_back: (
-            offset: (-1.5, -2.0, -5.0),
-            lateral: ("npc.dodarock.male.foot_br"),
-        ),
-        right_back: (
-            offset: (-1.5, -2.0, -5.0),
-            lateral: ("npc.dodarock.male.foot_br"),
-        ),
-    ),
-    (Dodarock, Female): (
-        left_front: (
-            offset: (-2.0, -3.0, -6.5),
-            lateral: ("npc.dodarock.male.foot_fr"),
-        ),
-        right_front: (
-            offset: (-2.0, -3.0, -6.5),
-            lateral: ("npc.dodarock.male.foot_fr"),
-        ),
-        left_back: (
-            offset: (-1.5, -2.0, -5.0),
-            lateral: ("npc.dodarock.male.foot_br"),
-        ),
-        right_back: (
-            offset: (-1.5, -2.0, -5.0),
-            lateral: ("npc.dodarock.male.foot_br"),
-        ),
-    ),
     (Holladon, Male): (
         left_front: (
             offset: (-1.0, -2.5, -6.0),
diff --git a/assets/voxygen/voxel/theropod_central_manifest.ron b/assets/voxygen/voxel/theropod_central_manifest.ron
index 341c6d447d..4333c6e87c 100644
--- a/assets/voxygen/voxel/theropod_central_manifest.ron
+++ b/assets/voxygen/voxel/theropod_central_manifest.ron
@@ -419,6 +419,66 @@
             central: ("npc.yale.male.tail_back"),
         ),
     ),
+    (Dodarock, Male): (
+        head: (
+            offset: (-3.5, -1.0, -3.5),
+            central: ("npc.dodarock.male.head"),
+        ),
+        jaw: (
+            offset: (-5.5, -1.0, -3.0),
+            central: ("npc.dodarock.male.jaw"),
+        ),
+        neck: (
+            offset: (-2.5, -1.0, -5.0),
+            central: ("npc.dodarock.male.neck"),
+        ),
+        chest_front: (
+            offset: (-4.5, -1.0, -6.0),
+            central: ("npc.dodarock.male.chest_front"),
+        ),
+        chest_back: (
+            offset: (-4.5, -1.0, -5.0),
+            central: ("npc.dodarock.male.chest_back"),
+        ),
+        tail_front: (
+            offset: (-2.5, -1.0, -1.0),
+            central: ("npc.dodarock.male.tail_front"),
+        ),
+        tail_back: (
+            offset: (-4.5, -1.0, -2.5),
+            central: ("npc.dodarock.male.tail_back"),
+        ),
+    ),
+    (Dodarock, Female): (
+        head: (
+            offset: (-3.5, -1.0, -3.5),
+            central: ("npc.dodarock.male.head"),
+        ),
+        jaw: (
+            offset: (-5.5, -1.0, -3.0),
+            central: ("npc.dodarock.male.jaw"),
+        ),
+        neck: (
+            offset: (-2.5, -1.0, -5.0),
+            central: ("npc.dodarock.male.neck"),
+        ),
+        chest_front: (
+            offset: (-4.5, -1.0, -6.0),
+            central: ("npc.dodarock.male.chest_front"),
+        ),
+        chest_back: (
+            offset: (-4.5, -1.0, -5.0),
+            central: ("npc.dodarock.male.chest_back"),
+        ),
+        tail_front: (
+            offset: (-2.5, -1.0, -1.0),
+            central: ("npc.dodarock.male.tail_front"),
+        ),
+        tail_back: (
+            offset: (-4.5, -1.0, -2.5),
+            central: ("npc.dodarock.male.tail_back"),
+        ),
+    ),
     (Ntouka, Male): (
         head: (
             offset: (-11.5, -8.0, -5.0),
diff --git a/assets/voxygen/voxel/theropod_lateral_manifest.ron b/assets/voxygen/voxel/theropod_lateral_manifest.ron
index 7036d052c7..fdc46daeff 100644
--- a/assets/voxygen/voxel/theropod_lateral_manifest.ron
+++ b/assets/voxygen/voxel/theropod_lateral_manifest.ron
@@ -363,6 +363,58 @@
             lateral: ("npc.yale.male.foot_r"),
         ),
     ),
+    (Dodarock, Male): (
+        hand_l: (
+            offset: (-2.5, -1.0, -6.0),
+            lateral: ("npc.dodarock.male.hand_r"),
+        ),
+        hand_r: (
+            offset: (-2.5, -1.0, -6.0),
+            lateral: ("npc.dodarock.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-2.0, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.foot_r"),
+        ),
+    ),
+    (Dodarock, Female): (
+        hand_l: (
+            offset: (-2.5, -1.0, -6.0),
+            lateral: ("npc.dodarock.male.hand_r"),
+        ),
+        hand_r: (
+            offset: (-2.5, -1.0, -6.0),
+            lateral: ("npc.dodarock.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.leg_r"),
+        ),
+        leg_r: (
+            offset: (-2.0, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.foot_r"),
+        ),
+        foot_r: (
+            offset: (-3.5, -1.0, -3.0),
+            lateral: ("npc.dodarock.male.foot_r"),
+        ),
+    ),
     (Ntouka, Male): (
         hand_l: (
             offset: (-4.0, -2.5, -8.0),
diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs
index 02768a9a49..8e0c63f8ae 100644
--- a/common/src/comp/agent.rs
+++ b/common/src/comp/agent.rs
@@ -206,7 +206,6 @@ impl<'a> From<&'a Body> for Psyche {
                     quadruped_small::Species::Cat => 0.9,
                     quadruped_small::Species::Batfox => 0.1,
                     quadruped_small::Species::Raccoon => 0.6,
-                    quadruped_small::Species::Dodarock => 0.0,
                     quadruped_small::Species::Holladon => 0.0,
                     quadruped_small::Species::Hyena => 0.2,
                     quadruped_small::Species::Dog => 0.8,
@@ -237,6 +236,8 @@ impl<'a> From<&'a Body> for Psyche {
                     quadruped_low::Species::Pangolin => 0.6,
                     quadruped_low::Species::Tortoise => 0.2,
                     quadruped_low::Species::Rocksnapper => 0.05,
+                    quadruped_low::Species::Rootsnapper => 0.05,
+                    quadruped_low::Species::Reefsnapper => 0.05,
                     quadruped_low::Species::Asp => 0.05,
                     _ => 0.0,
                 },
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 8cf7018d74..657c5aa35c 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -335,8 +335,7 @@ impl Body {
                 quadruped_small::Species::Beaver => 10.0,
                 quadruped_small::Species::Boar => 80.0, // ~✅ (60-100 kg)
                 quadruped_small::Species::Cat => 4.0,   // ~✅ (4-5 kg)
-                quadruped_small::Species::Dodarock => 500.0,
-                quadruped_small::Species::Dog => 30.0, // ~✅ (German Shepherd: 30-40 kg)
+                quadruped_small::Species::Dog => 30.0,  // ~✅ (German Shepherd: 30-40 kg)
                 quadruped_small::Species::Fox => 10.0,
                 quadruped_small::Species::Frog => 1.0,
                 quadruped_small::Species::Fungome => 10.0,
@@ -364,7 +363,7 @@ impl Body {
                 theropod::Species::Archaeos => 13_000.0,
                 theropod::Species::Ntouka => 13_000.0,
                 theropod::Species::Odonto => 13_000.0,
-
+                theropod::Species::Dodarock => 700.0,
                 theropod::Species::Sandraptor => 500.0,
                 theropod::Species::Snowraptor => 500.0,
                 theropod::Species::Sunlizard => 500.0,
@@ -458,7 +457,6 @@ impl Body {
             },
             Body::QuadrupedSmall(body) => match body.species {
                 quadruped_small::Species::Batfox => Vec3::new(1.4, 1.7, 1.3),
-                quadruped_small::Species::Dodarock => Vec3::new(1.2, 1.9, 1.5),
                 quadruped_small::Species::Holladon => Vec3::new(1.3, 1.9, 1.5),
                 quadruped_small::Species::Hyena => Vec3::new(1.2, 1.4, 1.3),
                 quadruped_small::Species::Truffler => Vec3::new(1.2, 1.8, 2.2),
@@ -477,6 +475,8 @@ impl Body {
                 quadruped_low::Species::Monitor => Vec3::new(1.4, 3.2, 1.3),
                 quadruped_low::Species::Pangolin => Vec3::new(1.0, 2.6, 1.1),
                 quadruped_low::Species::Rocksnapper => Vec3::new(2.5, 3.5, 2.9),
+                quadruped_low::Species::Rootsnapper => Vec3::new(2.5, 3.5, 2.9),
+                quadruped_low::Species::Reefsnapper => Vec3::new(2.5, 3.5, 2.9),
                 quadruped_low::Species::Sandshark => Vec3::new(2.1, 4.3, 1.7),
                 quadruped_low::Species::Basilisk => Vec3::new(2.7, 6.0, 2.9),
                 quadruped_low::Species::Salamander => Vec3::new(1.7, 4.0, 1.3),
@@ -488,6 +488,7 @@ impl Body {
                 theropod::Species::Archaeos => Vec3::new(4.0, 8.5, 8.0),
                 theropod::Species::Ntouka => Vec3::new(4.0, 9.0, 6.6),
                 theropod::Species::Odonto => Vec3::new(4.0, 8.0, 6.6),
+                theropod::Species::Dodarock => Vec3::new(2.0, 3.0, 2.6),
                 theropod::Species::Sandraptor => Vec3::new(2.0, 3.0, 2.6),
                 theropod::Species::Snowraptor => Vec3::new(2.0, 3.0, 2.6),
                 theropod::Species::Sunlizard => Vec3::new(2.0, 3.6, 2.5),
@@ -623,6 +624,10 @@ impl Body {
                 bird_large::Species::Phoenix => 600,
                 bird_large::Species::Roc => 500,
                 bird_large::Species::FlameWyvern => 600,
+                bird_large::Species::CloudWyvern => 600,
+                bird_large::Species::FrostWyvern => 600,
+                bird_large::Species::SeaWyvern => 600,
+                bird_large::Species::WealdWyvern => 600,
             },
             Body::Humanoid(_) => 75,
             _ => 100,
@@ -636,7 +641,6 @@ impl Body {
             Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
                 quadruped_small::Species::Boar => 70,
                 quadruped_small::Species::Batfox => 40,
-                quadruped_small::Species::Dodarock => 100,
                 quadruped_small::Species::Holladon => 80,
                 quadruped_small::Species::Hyena => 45,
                 quadruped_small::Species::Truffler => 45,
@@ -753,6 +757,7 @@ impl Body {
             Body::Theropod(theropod) => match theropod.species {
                 theropod::Species::Archaeos => 350,
                 theropod::Species::Yale => 280,
+                theropod::Species::Dodarock => 200,
                 theropod::Species::Odonto => 300,
                 theropod::Species::Ntouka => 300,
                 _ => 110,
@@ -765,6 +770,8 @@ impl Body {
                 quadruped_low::Species::Asp => 75,
                 quadruped_low::Species::Tortoise => 90,
                 quadruped_low::Species::Rocksnapper => 140,
+                quadruped_low::Species::Rootsnapper => 140,
+                quadruped_low::Species::Reefsnapper => 140,
                 quadruped_low::Species::Pangolin => 40,
                 quadruped_low::Species::Maneater => 130,
                 quadruped_low::Species::Sandshark => 110,
@@ -816,6 +823,10 @@ impl Body {
                     bird_large::Species::Phoenix
                         | bird_large::Species::Cockatrice
                         | bird_large::Species::FlameWyvern
+                        | bird_large::Species::CloudWyvern
+                        | bird_large::Species::FrostWyvern
+                        | bird_large::Species::SeaWyvern
+                        | bird_large::Species::WealdWyvern
                 ),
                 Body::Arthropod(b) => matches!(b.species, arthropod::Species::Moltencrawler),
                 _ => false,
diff --git a/common/src/comp/body/bird_large.rs b/common/src/comp/body/bird_large.rs
index fdc2dfdec0..8560aad74a 100644
--- a/common/src/comp/body/bird_large.rs
+++ b/common/src/comp/body/bird_large.rs
@@ -38,6 +38,10 @@ make_case_elim!(
         Cockatrice = 1,
         Roc = 2,
         FlameWyvern = 3,
+        CloudWyvern = 4,
+        FrostWyvern = 5,
+        SeaWyvern = 6,
+        WealdWyvern = 7,
     }
 );
 
@@ -50,6 +54,10 @@ pub struct AllSpecies<SpeciesMeta> {
     pub cockatrice: SpeciesMeta,
     pub roc: SpeciesMeta,
     pub wyvern_flame: SpeciesMeta,
+    pub wyvern_cloud: SpeciesMeta,
+    pub wyvern_frost: SpeciesMeta,
+    pub wyvern_sea: SpeciesMeta,
+    pub wyvern_weald: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -62,15 +70,23 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Cockatrice => &self.cockatrice,
             Species::Roc => &self.roc,
             Species::FlameWyvern => &self.wyvern_flame,
+            Species::CloudWyvern => &self.wyvern_cloud,
+            Species::FrostWyvern => &self.wyvern_frost,
+            Species::SeaWyvern => &self.wyvern_sea,
+            Species::WealdWyvern => &self.wyvern_weald,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 4] = [
+pub const ALL_SPECIES: [Species; 8] = [
     Species::Phoenix,
     Species::Cockatrice,
     Species::Roc,
     Species::FlameWyvern,
+    Species::CloudWyvern,
+    Species::FrostWyvern,
+    Species::SeaWyvern,
+    Species::WealdWyvern,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
diff --git a/common/src/comp/body/quadruped_low.rs b/common/src/comp/body/quadruped_low.rs
index e779d70c5d..7affcab6bf 100644
--- a/common/src/comp/body/quadruped_low.rs
+++ b/common/src/comp/body/quadruped_low.rs
@@ -45,17 +45,19 @@ make_case_elim!(
         Monitor = 3,
         Asp = 4,
         Tortoise = 5,
-        Rocksnapper = 6,
-        Pangolin = 7,
-        Maneater = 8,
-        Sandshark = 9,
-        Hakulaq = 10,
-        Lavadrake = 11,
-        Basilisk = 12,
-        Deadwood = 13,
-        Icedrake = 14,
-        SeaCrocodile = 15,
-        Dagon = 16,
+        Pangolin = 6,
+        Maneater = 7,
+        Sandshark = 8,
+        Hakulaq = 9,
+        Lavadrake = 10,
+        Basilisk = 11,
+        Deadwood = 12,
+        Icedrake = 13,
+        SeaCrocodile = 14,
+        Dagon = 15,
+        Rocksnapper = 16,
+        Rootsnapper = 17,
+        Reefsnapper = 18,
     }
 );
 
@@ -72,6 +74,8 @@ pub struct AllSpecies<SpeciesMeta> {
     pub asp: SpeciesMeta,
     pub tortoise: SpeciesMeta,
     pub rocksnapper: SpeciesMeta,
+    pub rootsnapper: SpeciesMeta,
+    pub reefsnapper: SpeciesMeta,
     pub pangolin: SpeciesMeta,
     pub maneater: SpeciesMeta,
     pub sandshark: SpeciesMeta,
@@ -97,6 +101,8 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Asp => &self.asp,
             Species::Tortoise => &self.tortoise,
             Species::Rocksnapper => &self.rocksnapper,
+            Species::Rootsnapper => &self.rootsnapper,
+            Species::Reefsnapper => &self.reefsnapper,
             Species::Pangolin => &self.pangolin,
             Species::Maneater => &self.maneater,
             Species::Sandshark => &self.sandshark,
@@ -110,7 +116,7 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
     }
 }
 
-pub const ALL_SPECIES: [Species; 17] = [
+pub const ALL_SPECIES: [Species; 19] = [
     Species::Crocodile,
     Species::SeaCrocodile,
     Species::Alligator,
@@ -119,6 +125,8 @@ pub const ALL_SPECIES: [Species; 17] = [
     Species::Asp,
     Species::Tortoise,
     Species::Rocksnapper,
+    Species::Rootsnapper,
+    Species::Reefsnapper,
     Species::Pangolin,
     Species::Maneater,
     Species::Sandshark,
diff --git a/common/src/comp/body/quadruped_small.rs b/common/src/comp/body/quadruped_small.rs
index 75a5428283..0a23d4fbb8 100644
--- a/common/src/comp/body/quadruped_small.rs
+++ b/common/src/comp/body/quadruped_small.rs
@@ -45,7 +45,7 @@ pub enum Species {
     Batfox = 7,
     Raccoon = 8,
     Quokka = 9,
-    Dodarock = 10,
+    Goat = 10,
     Holladon = 11,
     Hyena = 12,
     Rabbit = 13,
@@ -61,7 +61,6 @@ pub enum Species {
     Beaver = 23,
     Hare = 24,
     Dog = 25,
-    Goat = 26,
 }
 
 /// Data representing per-species generic data.
@@ -79,7 +78,6 @@ pub struct AllSpecies<SpeciesMeta> {
     pub batfox: SpeciesMeta,
     pub raccoon: SpeciesMeta,
     pub quokka: SpeciesMeta,
-    pub dodarock: SpeciesMeta,
     pub holladon: SpeciesMeta,
     pub hyena: SpeciesMeta,
     pub rabbit: SpeciesMeta,
@@ -114,7 +112,6 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Batfox => &self.batfox,
             Species::Raccoon => &self.raccoon,
             Species::Quokka => &self.quokka,
-            Species::Dodarock => &self.dodarock,
             Species::Holladon => &self.holladon,
             Species::Hyena => &self.hyena,
             Species::Rabbit => &self.rabbit,
@@ -135,7 +132,7 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
     }
 }
 
-pub const ALL_SPECIES: [Species; 27] = [
+pub const ALL_SPECIES: [Species; 26] = [
     Species::Pig,
     Species::Fox,
     Species::Sheep,
@@ -146,7 +143,6 @@ pub const ALL_SPECIES: [Species; 27] = [
     Species::Batfox,
     Species::Raccoon,
     Species::Quokka,
-    Species::Dodarock,
     Species::Holladon,
     Species::Hyena,
     Species::Rabbit,
diff --git a/common/src/comp/body/theropod.rs b/common/src/comp/body/theropod.rs
index 5f1abcda53..5ef4df981f 100644
--- a/common/src/comp/body/theropod.rs
+++ b/common/src/comp/body/theropod.rs
@@ -36,6 +36,7 @@ pub enum Species {
     Sunlizard = 5,
     Yale = 6,
     Ntouka = 7,
+    Dodarock = 8,
 }
 
 /// Data representing per-species generic data.
@@ -48,6 +49,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub raptor_wood: SpeciesMeta,
     pub sunlizard: SpeciesMeta,
     pub yale: SpeciesMeta,
+    pub dodarock: SpeciesMeta,
     pub ntouka: SpeciesMeta,
 }
 
@@ -64,12 +66,13 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Woodraptor => &self.raptor_wood,
             Species::Sunlizard => &self.sunlizard,
             Species::Yale => &self.yale,
+            Species::Dodarock => &self.dodarock,
             Species::Ntouka => &self.ntouka,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 8] = [
+pub const ALL_SPECIES: [Species; 9] = [
     Species::Archaeos,
     Species::Odonto,
     Species::Sandraptor,
@@ -77,6 +80,7 @@ pub const ALL_SPECIES: [Species; 8] = [
     Species::Woodraptor,
     Species::Sunlizard,
     Species::Yale,
+    Species::Dodarock,
     Species::Ntouka,
 ];
 
diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs
index 74ecb92091..2e0f1c6cfc 100644
--- a/common/src/comp/inventory/loadout_builder.rs
+++ b/common/src/comp/inventory/loadout_builder.rs
@@ -756,9 +756,17 @@ fn default_main_tool(body: &Body) -> Item {
             )),
         },
         Body::BirdLarge(bird_large) => match (bird_large.species, bird_large.body_type) {
-            (bird_large::Species::Cockatrice | bird_large::Species::FlameWyvern, _) => Some(
-                Item::new_from_asset_expect("common.items.npc_weapons.unique.birdlargebreathe"),
-            ),
+            (
+                bird_large::Species::Cockatrice
+                | bird_large::Species::FlameWyvern
+                | bird_large::Species::CloudWyvern
+                | bird_large::Species::FrostWyvern
+                | bird_large::Species::SeaWyvern
+                | bird_large::Species::WealdWyvern,
+                _,
+            ) => Some(Item::new_from_asset_expect(
+                "common.items.npc_weapons.unique.birdlargebreathe",
+            )),
             (bird_large::Species::Phoenix, _) => Some(Item::new_from_asset_expect(
                 "common.items.npc_weapons.unique.birdlargefire",
             )),
@@ -892,6 +900,8 @@ impl LoadoutBuilder {
                 | quadruped_low::Species::Lavadrake
                 | quadruped_low::Species::Maneater
                 | quadruped_low::Species::Rocksnapper
+                | quadruped_low::Species::Rootsnapper
+                | quadruped_low::Species::Reefsnapper
                 | quadruped_low::Species::Sandshark => {
                     Some("common.items.npc_armor.quadruped_low.generic")
                 },
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index bae3791364..5dfa4a0897 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -43,7 +43,6 @@ impl Body {
                 quadruped_small::Species::Fungome => 70.0,
                 quadruped_small::Species::Goat => 80.0,
                 quadruped_small::Species::Raccoon => 100.0,
-                quadruped_small::Species::Dodarock => 80.0,
                 quadruped_small::Species::Frog => 150.0,
                 quadruped_small::Species::Porcupine => 100.0,
                 quadruped_small::Species::Beaver => 100.0,
@@ -122,6 +121,8 @@ impl Body {
                 quadruped_low::Species::Asp => 110.0,
                 quadruped_low::Species::Tortoise => 60.0,
                 quadruped_low::Species::Rocksnapper => 70.0,
+                quadruped_low::Species::Rootsnapper => 70.0,
+                quadruped_low::Species::Reefsnapper => 70.0,
                 quadruped_low::Species::Pangolin => 90.0,
                 quadruped_low::Species::Maneater => 80.0,
                 quadruped_low::Species::Sandshark => 160.0,
@@ -192,12 +193,14 @@ impl Body {
                 theropod::Species::Archaeos => 2.3,
                 theropod::Species::Odonto => 2.3,
                 theropod::Species::Ntouka => 2.3,
+                theropod::Species::Dodarock => 2.0,
                 _ => 2.5,
             },
             Body::QuadrupedLow(quadruped_low) => match quadruped_low.species {
                 quadruped_low::Species::Asp => 2.2,
                 quadruped_low::Species::Tortoise => 1.5,
                 quadruped_low::Species::Rocksnapper => 1.8,
+                quadruped_low::Species::Rootsnapper => 1.8,
                 quadruped_low::Species::Lavadrake => 1.7,
                 quadruped_low::Species::Icedrake => 1.7,
                 _ => 2.0,
@@ -226,6 +229,7 @@ impl Body {
                 | theropod::Species::Snowraptor
                 | theropod::Species::Sunlizard
                 | theropod::Species::Woodraptor
+                | theropod::Species::Dodarock
                 | theropod::Species::Yale => Some(200.0 * self.mass().0),
                 _ => Some(100.0 * self.mass().0),
             },
diff --git a/voxygen/anim/src/bird_large/mod.rs b/voxygen/anim/src/bird_large/mod.rs
index 75c32a2d83..c7232e012b 100644
--- a/voxygen/anim/src/bird_large/mod.rs
+++ b/voxygen/anim/src/bird_large/mod.rs
@@ -170,80 +170,139 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Cockatrice, _) => (2.5, 16.0),
                 (Roc, _) => (2.5, 27.5),
                 (FlameWyvern, _) => (2.5, 20.5),
+                (CloudWyvern, _) => (2.5, 20.5),
+                (FrostWyvern, _) => (2.5, 20.5),
+                (SeaWyvern, _) => (2.5, 20.5),
+                (WealdWyvern, _) => (2.5, 20.5),
             },
             neck: match (body.species, body.body_type) {
                 (Phoenix, _) => (2.5, -5.5),
                 (Cockatrice, _) => (5.0, -1.5),
                 (Roc, _) => (9.5, -1.5),
                 (FlameWyvern, _) => (11.0, -0.5),
+                (CloudWyvern, _) => (11.0, -0.5),
+                (FrostWyvern, _) => (11.0, -0.5),
+                (SeaWyvern, _) => (11.0, -0.5),
+                (WealdWyvern, _) => (11.0, -0.5),
             },
             head: match (body.species, body.body_type) {
                 (Phoenix, _) => (6.0, 12.0),
                 (Cockatrice, _) => (8.0, 4.5),
                 (Roc, _) => (17.0, -3.5),
                 (FlameWyvern, _) => (10.0, -1.5),
+                (CloudWyvern, _) => (10.0, -1.5),
+                (FrostWyvern, _) => (10.0, -1.5),
+                (SeaWyvern, _) => (10.0, -1.5),
+                (WealdWyvern, _) => (10.0, -1.5),
             },
             beak: match (body.species, body.body_type) {
                 (Phoenix, _) => (5.0, 3.0),
                 (Cockatrice, _) => (2.0, -3.0),
                 (Roc, _) => (0.0, -3.0),
-                (FlameWyvern, _) => (-1.0, 2.0),
+                (FlameWyvern, _) => (-3.0, 2.0),
+                (CloudWyvern, _) => (-3.0, 2.0),
+                (FrostWyvern, _) => (-3.0, 2.0),
+                (SeaWyvern, _) => (-3.0, 2.0),
+                (WealdWyvern, _) => (-3.0, 2.0),
             },
             tail_front: match (body.species, body.body_type) {
                 (Phoenix, _) => (-9.5, -1.0),
                 (Cockatrice, _) => (-5.0, -2.5),
                 (Roc, _) => (-7.5, -3.5),
                 (FlameWyvern, _) => (-10.0, -5.0),
+                (CloudWyvern, _) => (-10.0, -5.0),
+                (FrostWyvern, _) => (-10.0, -5.0),
+                (SeaWyvern, _) => (-10.0, -5.0),
+                (WealdWyvern, _) => (-10.0, -5.0),
             },
             tail_rear: match (body.species, body.body_type) {
                 (Phoenix, _) => (-11.0, 0.0),
                 (Cockatrice, _) => (-8.0, -3.0),
                 (Roc, _) => (-8.0, -3.0),
                 (FlameWyvern, _) => (-11.0, -1.0),
+                (CloudWyvern, _) => (-11.0, -1.0),
+                (FrostWyvern, _) => (-11.0, -1.0),
+                (SeaWyvern, _) => (-11.0, -1.0),
+                (WealdWyvern, _) => (-11.0, -1.0),
             },
             wing_in: match (body.species, body.body_type) {
                 (Phoenix, _) => (3.0, 2.5, 2.0),
                 (Cockatrice, _) => (3.5, 7.0, 3.5),
                 (Roc, _) => (5.5, 7.5, -1.0),
-                (FlameWyvern, _) => (5.5, 5.0, -2.0),
+                (FlameWyvern, _) => (6.5, 5.0, -2.0),
+                (CloudWyvern, _) => (4.5, 5.0, -4.0),
+                (FrostWyvern, _) => (6.5, 5.0, -2.0),
+                (SeaWyvern, _) => (6.5, 5.0, -2.0),
+                (WealdWyvern, _) => (5.0, 5.0, -2.0),
             },
             wing_mid: match (body.species, body.body_type) {
                 (Phoenix, _) => (10.0, 1.0, 0.0),
                 (Cockatrice, _) => (6.0, 0.0, 0.0),
                 (Roc, _) => (12.0, 1.0, -0.5),
                 (FlameWyvern, _) => (19.0, 15.0, -1.0),
+                (CloudWyvern, _) => (19.0, 15.0, -1.0),
+                (FrostWyvern, _) => (19.0, 15.0, -1.0),
+                (SeaWyvern, _) => (19.0, 15.0, -1.0),
+                (WealdWyvern, _) => (19.0, 15.0, -1.0),
             },
             wing_out: match (body.species, body.body_type) {
                 (Phoenix, _) => (7.0, 2.0, 1.5),
                 (Cockatrice, _) => (4.0, -1.0, 1.0),
                 (Roc, _) => (10.0, -2.0, 0.0),
-                (FlameWyvern, _) => (16.0, -3.0, 0.0),
+                (FlameWyvern, _) => (10.0, -3.0, 0.0),
+                (CloudWyvern, _) => (10.0, -3.0, 0.0),
+                (FrostWyvern, _) => (10.0, -3.0, 0.0),
+                (SeaWyvern, _) => (10.0, -3.0, 0.0),
+                (WealdWyvern, _) => (16.0, -3.0, 0.0),
             },
             leg: match (body.species, body.body_type) {
                 (Phoenix, _) => (4.0, 1.5, 12.0),
                 (Cockatrice, _) => (3.5, 2.5, 13.0),
                 (Roc, _) => (5.5, -1.5, 17.5),
-                (FlameWyvern, _) => (5.5, -2.0, 15.5),
+                (FlameWyvern, _) => (5.5, 2.0, 15.5),
+                (CloudWyvern, _) => (5.5, 2.0, 15.5),
+                (FrostWyvern, _) => (5.5, 2.0, 15.5),
+                (SeaWyvern, _) => (5.5, 2.0, 15.5),
+                (WealdWyvern, _) => (5.5, 2.0, 15.5),
             },
             foot: match (body.species, body.body_type) {
                 (Phoenix, _) => (0.5, -0.5, -2.5),
                 (Cockatrice, _) => (0.5, -3.0, -3.0),
                 (Roc, _) => (2.5, -2.5, -5.5),
                 (FlameWyvern, _) => (0.5, 0.0, -3.5),
+                (CloudWyvern, _) => (0.5, 0.0, -3.5),
+                (FrostWyvern, _) => (0.5, 0.0, -3.5),
+                (SeaWyvern, _) => (0.5, 0.0, -3.5),
+                (WealdWyvern, _) => (0.5, 0.0, -3.5),
             },
             scaler: match (body.species, body.body_type) {
                 (Phoenix, _) => (1.0),
                 (Cockatrice, _) => (1.0),
                 (Roc, _) => (1.0),
-                (FlameWyvern, _) => (1.0),
+                (FlameWyvern, _)
+                | (CloudWyvern, _)
+                | (FrostWyvern, _)
+                | (SeaWyvern, _)
+                | (WealdWyvern, _) => (1.0),
             },
             feed: match (body.species, body.body_type) {
                 (Phoenix, _) => (-0.65),
                 (Cockatrice, _) => (-0.5),
                 (Roc, _) => (-0.4),
-                (FlameWyvern, _) => (-0.65),
+                (FlameWyvern, _)
+                | (CloudWyvern, _)
+                | (FrostWyvern, _)
+                | (SeaWyvern, _)
+                | (WealdWyvern, _) => (-0.65),
             },
-            wyvern: matches!((body.species, body.body_type), (FlameWyvern, _)),
+            wyvern: matches!(
+                (body.species, body.body_type),
+                (FlameWyvern, _)
+                    | (CloudWyvern, _)
+                    | (FrostWyvern, _)
+                    | (SeaWyvern, _)
+                    | (WealdWyvern, _)
+            ),
         }
     }
 }
diff --git a/voxygen/anim/src/quadruped_low/mod.rs b/voxygen/anim/src/quadruped_low/mod.rs
index 2b0a2df6db..e21d486d3e 100644
--- a/voxygen/anim/src/quadruped_low/mod.rs
+++ b/voxygen/anim/src/quadruped_low/mod.rs
@@ -160,6 +160,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (4.5, 10.5),
                 (Tortoise, _) => (5.0, 1.0),
                 (Rocksnapper, _) => (6.0, 0.5),
+                (Rootsnapper, _) => (6.0, 0.5),
+                (Reefsnapper, _) => (6.0, 0.5),
                 (Pangolin, _) => (-0.5, 8.0),
                 (Maneater, _) => (7.0, 11.5),
                 (Sandshark, _) => (8.5, 0.5),
@@ -180,6 +182,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (6.0, -2.5),
                 (Tortoise, _) => (12.0, -3.5),
                 (Rocksnapper, _) => (12.0, -9.0),
+                (Rootsnapper, _) => (12.0, -9.0),
+                (Reefsnapper, _) => (12.0, -9.0),
                 (Pangolin, _) => (8.0, -9.0),
                 (Maneater, _) => (1.0, 4.5),
                 (Sandshark, _) => (13.5, -10.5),
@@ -200,6 +204,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (2.0, -2.0),
                 (Tortoise, _) => (-3.5, -2.0),
                 (Rocksnapper, _) => (-5.0, -1.5),
+                (Rootsnapper, _) => (-5.0, -1.5),
+                (Reefsnapper, _) => (-5.0, -1.5),
                 (Pangolin, _) => (0.0, 0.0),
                 (Maneater, _) => (-1.0, 4.0),
                 (Sandshark, _) => (-8.0, -5.5),
@@ -220,6 +226,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (0.0, 8.0),
                 (Tortoise, _) => (0.0, 11.0),
                 (Rocksnapper, _) => (0.0, 18.5),
+                (Rootsnapper, _) => (0.0, 18.5),
+                (Reefsnapper, _) => (0.0, 18.5),
                 (Pangolin, _) => (0.0, 7.0),
                 (Maneater, _) => (0.0, 12.0),
                 (Sandshark, _) => (0.0, 20.0),
@@ -240,6 +248,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (-14.0, -2.0),
                 (Tortoise, _) => (-10.0, -1.5),
                 (Rocksnapper, _) => (-14.5, -2.0),
+                (Rootsnapper, _) => (-14.5, -2.0),
+                (Reefsnapper, _) => (-14.5, -2.0),
                 (Pangolin, _) => (-7.0, -3.0),
                 (Maneater, _) => (-15.0, 4.0),
                 (Sandshark, _) => (-10.0, 0.5),
@@ -260,6 +270,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (-6.0, -2.0),
                 (Tortoise, _) => (-13.0, -3.5),
                 (Rocksnapper, _) => (-13.5, -6.5),
+                (Rootsnapper, _) => (-13.5, -6.5),
+                (Reefsnapper, _) => (-13.5, -6.5),
                 (Pangolin, _) => (-7.5, -0.5),
                 (Maneater, _) => (-1.0, 4.0),
                 (Sandshark, _) => (-13.0, -8.0),
@@ -280,6 +292,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (1.5, 4.0, -1.0),
                 (Tortoise, _) => (5.5, 6.5, -3.0),
                 (Rocksnapper, _) => (7.5, 5.0, -8.5),
+                (Rootsnapper, _) => (7.5, 5.0, -8.5),
+                (Reefsnapper, _) => (7.5, 5.0, -8.5),
                 (Pangolin, _) => (5.5, 5.5, -1.0),
                 (Maneater, _) => (4.5, 4.0, -5.5),
                 (Sandshark, _) => (5.5, 2.0, -8.0),
@@ -300,6 +314,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Asp, _) => (2.5, -5.5, -1.0),
                 (Tortoise, _) => (5.5, -11.5, -3.0),
                 (Rocksnapper, _) => (8.0, -12.0, -9.5),
+                (Rootsnapper, _) => (8.0, -12.0, -9.5),
+                (Reefsnapper, _) => (8.0, -12.0, -9.5),
                 (Pangolin, _) => (6.5, -3.5, -1.0),
                 (Maneater, _) => (4.5, -2.5, -3.0),
                 (Sandshark, _) => (3.5, -15.0, -14.0),
@@ -322,6 +338,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Monitor, _) => (0.9),
                 (Asp, _) => (1.12),
                 (Rocksnapper, _) => (1.12),
+                (Rootsnapper, _) => (1.12),
+                (Reefsnapper, _) => (1.12),
                 (Hakulaq, _) => (1.05),
                 (Dagon, _) => (1.05),
                 (Pangolin, _) => (1.05),
@@ -339,6 +357,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Monitor, _) => (1.4),
                 (Tortoise, _) => (0.7),
                 (Rocksnapper, _) => (0.7),
+                (Rootsnapper, _) => (0.7),
+                (Reefsnapper, _) => (0.7),
                 (Hakulaq, _) => (1.2),
                 (Dagon, _) => (1.2),
                 (Pangolin, _) => (1.15),
@@ -363,6 +383,8 @@ fn mount_point(body: &Body) -> Vec3<f32> {
         (Asp, _) => (0.0, 2.0, 0.0),
         (Tortoise, _) => (0.0, -7.0, -1.0),
         (Rocksnapper, _) => (0.0, -7.0, 4.5),
+        (Rootsnapper, _) => (0.0, -7.0, 4.5),
+        (Reefsnapper, _) => (0.0, -7.0, 4.5),
         (Pangolin, _) => (0.0, -6.5, -2.0),
         (Maneater, _) => (0.0, 4.0, -11.5),
         (Sandshark, _) => (0.0, -4.0, -2.0),
diff --git a/voxygen/anim/src/quadruped_small/mod.rs b/voxygen/anim/src/quadruped_small/mod.rs
index 644f4c8a95..ded341a054 100644
--- a/voxygen/anim/src/quadruped_small/mod.rs
+++ b/voxygen/anim/src/quadruped_small/mod.rs
@@ -57,11 +57,7 @@ impl Skeleton for QuadrupedSmallSkeleton {
             make_bone(chest_mat * Mat4::<f32>::from(self.leg_br)),
             make_bone(chest_mat * Mat4::<f32>::from(self.tail)),
         ];
-        use comp::quadruped_small::Species::*;
-        let (mount_bone_mat, mount_bone_ori) = match (body.species, body.body_type) {
-            (Dodarock, _) => (head_mat, self.chest.orientation * self.head.orientation),
-            _ => (chest_mat, self.chest.orientation),
-        };
+        let (mount_bone_mat, mount_bone_ori) = (chest_mat, self.chest.orientation);
         let mount_position = (mount_bone_mat * Vec4::from_point(mount_point(&body)))
             .homogenized()
             .xyz();
@@ -139,7 +135,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Batfox, _) => (5.0, 1.0),
                 (Raccoon, _) => (5.0, 2.0),
                 (Quokka, _) => (6.0, 2.0),
-                (Dodarock, _) => (6.0, -2.0),
                 (Holladon, _) => (7.0, 1.0),
                 (Hyena, _) => (7.5, 2.0),
                 (Rabbit, _) => (4.0, 3.0),
@@ -169,7 +164,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Batfox, _) => (-2.0, 6.0),
                 (Raccoon, _) => (0.0, 5.5),
                 (Quokka, _) => (2.0, 6.5),
-                (Dodarock, _) => (-2.0, 9.0),
                 (Holladon, _) => (-2.0, 9.0),
                 (Hyena, _) => (-2.0, 9.0),
                 (Rabbit, _) => (-2.0, 6.0),
@@ -199,7 +193,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Batfox, _) => (3.0, 4.0, -0.5),
                 (Raccoon, _) => (4.0, 4.0, -0.0),
                 (Quokka, _) => (3.0, 4.0, -1.0),
-                (Dodarock, _) => (5.0, 5.0, -2.5),
                 (Holladon, _) => (5.0, 4.0, -2.5),
                 (Hyena, _) => (2.5, 5.0, -4.0),
                 (Rabbit, _) => (3.0, 3.0, -3.0),
@@ -229,7 +222,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Batfox, _) => (3.5, -2.0, -0.5),
                 (Raccoon, _) => (4.5, -3.0, 0.5),
                 (Quokka, _) => (4.0, -4.0, -1.0),
-                (Dodarock, _) => (3.5, -3.0, -4.0),
                 (Holladon, _) => (4.0, -2.0, -3.0),
                 (Hyena, _) => (3.0, -5.0, -2.5),
                 (Rabbit, _) => (3.5, -2.0, -1.0),
@@ -259,7 +251,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Batfox, _) => (0.0, 5.0),
                 (Raccoon, _) => (-4.0, 1.0),
                 (Quokka, _) => (-6.0, 1.0),
-                (Dodarock, _) => (0.0, 5.0),
                 (Holladon, _) => (-1.0, 4.0),
                 (Hyena, _) => (-7.0, 0.0),
                 (Rabbit, _) => (-4.0, -0.0),
@@ -286,7 +277,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Skunk, _) => (0.72),
                 (Cat, _) => (0.67),
                 (Batfox, _) => (0.9),
-                (Dodarock, _) => (0.95),
                 (Holladon, _) => (1.12),
                 (Rabbit, _) => (0.56),
                 (Frog, _) => (0.56),
@@ -339,7 +329,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Skunk, _) => (0.9),
                 (Cat, _) => (0.8),
                 (Quokka, _) => (0.9),
-                (Dodarock, _) => (0.9),
                 (Holladon, _) => (0.7),
                 (Hyena, _) => (1.4),
                 (Rabbit, _) => (0.8),
@@ -360,7 +349,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Batfox, _) => (1.1),
                 (Raccoon, _) => (1.1),
                 (Quokka, _) => (1.3),
-                (Dodarock, _) => (0.9),
                 (Holladon, _) => (0.7),
                 (Hyena, _) => (1.4),
                 (Rabbit, _) => (2.5),
@@ -382,7 +370,6 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Skunk, _) => (0.8),
                 (Batfox, _) => (0.7),
                 (Raccoon, _) => (0.8),
-                (Dodarock, _) => (0.7),
                 (Rabbit, _) => (1.2),
                 (Truffler, _) => (0.6),
                 (Frog, _) => (0.7),
@@ -416,7 +403,6 @@ fn mount_point(body: &Body) -> Vec3<f32> {
         (Batfox, _) => (0.0, -4.0, -3.0),
         (Raccoon, _) => (0.0, -4.0, -2.5),
         (Quokka, _) => (0.0, -3.0, -3.5),
-        (Dodarock, _) => (0.0, 0.0, 2.5),
         (Holladon, _) => (0.0, -2.0, -2.5),
         (Hyena, _) => (0.0, -4.0, -3.5),
         (Rabbit, _) => (0.0, -4.0, -3.5),
diff --git a/voxygen/anim/src/theropod/mod.rs b/voxygen/anim/src/theropod/mod.rs
index 582a24fd1e..22397bfd80 100644
--- a/voxygen/anim/src/theropod/mod.rs
+++ b/voxygen/anim/src/theropod/mod.rs
@@ -145,6 +145,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (8.0, 5.0),
                 (Sunlizard, _) => (6.5, 3.5),
                 (Yale, _) => (7.0, 14.0),
+                (Dodarock, _) => (2.0, 1.5),
                 (Ntouka, _) => (2.0, 2.5),
             },
             jaw: match (body.species, body.body_type) {
@@ -155,7 +156,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (0.0, -4.0),
                 (Sunlizard, _) => (2.0, -2.5),
                 (Yale, _) => (2.0, -9.5),
-                (Ntouka, _) => (0.0, -4.0),
+                (Dodarock, _) => (0.0, -5.0),
+                (Ntouka, _) => (0.0, 0.0),
             },
             neck: match (body.species, body.body_type) {
                 (Archaeos, _) => (4.5, -2.0),
@@ -165,6 +167,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (4.0, 2.5),
                 (Sunlizard, _) => (2.5, 1.5),
                 (Yale, _) => (2.0, 4.0),
+                (Dodarock, _) => (5.0, -1.0),
                 (Ntouka, _) => (4.0, 0.0),
             },
             chest_front: match (body.species, body.body_type) {
@@ -175,6 +178,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (0.0, 15.5),
                 (Sunlizard, _) => (0.0, 14.0),
                 (Yale, _) => (0.0, 19.5),
+                (Dodarock, _) => (0.0, 12.0),
                 (Ntouka, _) => (0.0, 13.0),
             },
             chest_back: match (body.species, body.body_type) {
@@ -185,6 +189,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (-3.0, 0.5),
                 (Sunlizard, _) => (-2.0, 0.0),
                 (Yale, _) => (-3.0, -1.0),
+                (Dodarock, _) => (-4.5, -2.0),
                 (Ntouka, _) => (-4.5, 1.0),
             },
             tail_front: match (body.species, body.body_type) {
@@ -195,6 +200,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (-9.5, -1.0),
                 (Sunlizard, _) => (-8.5, -2.0),
                 (Yale, _) => (-9.5, -4.0),
+                (Dodarock, _) => (-4.5, -4.5),
                 (Ntouka, _) => (-9.5, -3.5),
             },
             tail_back: match (body.species, body.body_type) {
@@ -203,9 +209,10 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Sandraptor, _) => (-10.5, 0.5),
                 (Snowraptor, _) => (-10.5, 1.0),
                 (Woodraptor, _) => (-10.5, 0.5),
-                (Sunlizard, _) => (-10.0, -0.5),
+                (Sunlizard, _) => (-10.0, -1.5),
                 (Yale, _) => (-5.0, -2.5),
-                (Ntouka, _) => (-9.5, -2.0),
+                (Dodarock, _) => (-8.5, -2.0),
+                (Ntouka, _) => (-9.5, -2.5),
             },
             hand: match (body.species, body.body_type) {
                 (Archaeos, _) => (3.0, 0.0, -4.0),
@@ -215,7 +222,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (2.5, 3.0, 1.0),
                 (Sunlizard, _) => (2.5, 1.5, -0.5),
                 (Yale, _) => (3.0, 2.0, -0.5),
-                (Ntouka, _) => (3.5, 3.0, -4.0),
+                (Dodarock, _) => (3.5, 3.0, -5.0),
+                (Ntouka, _) => (3.5, 3.0, 1.0),
             },
             leg: match (body.species, body.body_type) {
                 (Archaeos, _) => (2.5, -3.0, -4.0),
@@ -225,6 +233,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (1.5, -2.5, -3.0),
                 (Sunlizard, _) => (2.5, -2.5, -3.0),
                 (Yale, _) => (3.0, -3.5, -4.0),
+                (Dodarock, _) => (3.5, 1.5, -4.0),
                 (Ntouka, _) => (4.5, -5.5, -4.0),
             },
             foot: match (body.species, body.body_type) {
@@ -235,6 +244,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (2.0, 0.0, -3.0),
                 (Sunlizard, _) => (1.0, -0.5, -2.5),
                 (Yale, _) => (1.5, 1.0, -3.5),
+                (Dodarock, _) => (1.5, -1.0, -3.5),
                 (Ntouka, _) => (1.5, -1.0, -2.5),
             },
             scaler: match (body.species, body.body_type) {
@@ -245,6 +255,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Woodraptor, _) => (1.1),
                 (Sunlizard, _) => (1.1),
                 (Yale, _) => (1.26),
+                (Dodarock, _) => (1.1),
                 (Ntouka, _) => (2.93),
             },
         }