diff --git a/CHANGES b/CHANGES
index 31dad9f52..4c59aa083 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes for SVN top of tree:
 
+Add client_anim_... support for all objects that support it, remove
+their speed attributes if the only reason they had speed set was for
+animation.
+MSW 2007-07-09
+
 Remove all 'editable' fields, obsolete with Crossedit removal.
  (almost all .arc impacted)
 Nicolas Weeger 2007-06-13
diff --git a/armour/boots/idaten.arc b/armour/boots/idaten.arc
index 6075fc1fd..65a78f462 100644
--- a/armour/boots/idaten.arc
+++ b/armour/boots/idaten.arc
@@ -9,7 +9,8 @@ anim
 idaten.111
 idaten.112
 mina
-speed 0.3
+anim_speed 3
+client_anim_random 1
 exp 20
 value 50000
 weight 5000
diff --git a/armour/boots/speedboots.arc b/armour/boots/speedboots.arc
index ae6cf3494..bc8931ae3 100644
--- a/armour/boots/speedboots.arc
+++ b/armour/boots/speedboots.arc
@@ -11,7 +11,8 @@ speedboots.112
 speedboots.113
 speedboots.112
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 value 50000
 weight 5000
 type 99
diff --git a/armour/gauntlets/god_finger.arc b/armour/gauntlets/god_finger.arc
index 6ef511b98..3fd033ffc 100644
--- a/armour/gauntlets/god_finger.arc
+++ b/armour/gauntlets/god_finger.arc
@@ -9,7 +9,8 @@ anim
 god_finger.111
 god_finger.112
 mina
-speed .1
+anim_speed 10
+client_anim_random 1
 Str 2
 Dex -1
 magicmap orange
diff --git a/armour/gauntlets/shining_finger.arc b/armour/gauntlets/shining_finger.arc
index 1ab434f85..e469e0509 100644
--- a/armour/gauntlets/shining_finger.arc
+++ b/armour/gauntlets/shining_finger.arc
@@ -10,7 +10,8 @@ shining_finger.111
 shining_finger.112
 mina
 magicmap black
-speed .1
+anim_speed 10
+client_anim_random 1
 Str 2
 resist_physical 3
 dam +3
diff --git a/armour/girdle/gir_strcon.arc b/armour/girdle/gir_strcon.arc
index 1fb8d03ef..b18da33cf 100644
--- a/armour/girdle/gir_strcon.arc
+++ b/armour/girdle/gir_strcon.arc
@@ -10,7 +10,8 @@ anim
 gir_strcon.111
 gir_strcon.112
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 magicmap orange
 Str 1
 Con 1
diff --git a/armour/girdle/girdle_con.arc b/armour/girdle/girdle_con.arc
index 8b6982da6..25c957a34 100644
--- a/armour/girdle/girdle_con.arc
+++ b/armour/girdle/girdle_con.arc
@@ -10,7 +10,8 @@ anim
 girdle_con.111
 girdle_con.112
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 magicmap blue
 Con 2
 weight 2500
diff --git a/armour/girdle/girdle_dam.arc b/armour/girdle/girdle_dam.arc
index 079c99476..dd6eafc0a 100644
--- a/armour/girdle/girdle_dam.arc
+++ b/armour/girdle/girdle_dam.arc
@@ -10,7 +10,8 @@ anim
 girdle_dam.111
 girdle_dam.112
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 dam 10
 weight 2500
 value 70000
diff --git a/armour/girdle/girdle_str.arc b/armour/girdle/girdle_str.arc
index 39d1586dc..c7ba32701 100644
--- a/armour/girdle/girdle_str.arc
+++ b/armour/girdle/girdle_str.arc
@@ -12,7 +12,8 @@ girdle_str.112
 girdle_str.113
 girdle_str.114
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 magicmap red
 Str 2
 weight 2500
diff --git a/armour/helmet/helmetxray.arc b/armour/helmet/helmetxray.arc
index 5a7f6a2c4..f1ba07a96 100644
--- a/armour/helmet/helmetxray.arc
+++ b/armour/helmet/helmetxray.arc
@@ -9,7 +9,8 @@ anim
 helmetxray.111
 helmetxray.112
 mina
-speed 0.05
+anim_speed 20
+client_anim_random 1
 type 34
 weight 6000
 ac 2
diff --git a/armour/helmet/wiz_hat.arc b/armour/helmet/wiz_hat.arc
index cd8cfe5ea..4c3109af4 100644
--- a/armour/helmet/wiz_hat.arc
+++ b/armour/helmet/wiz_hat.arc
@@ -10,7 +10,8 @@ wiz_hat.111
 wiz_hat.112
 wiz_hat.113
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 magicmap black
 last_sp 12
 ac 1
diff --git a/armour/mail/Pdragonmail.arc b/armour/mail/Pdragonmail.arc
index db3a45e6e..aea937fad 100644
--- a/armour/mail/Pdragonmail.arc
+++ b/armour/mail/Pdragonmail.arc
@@ -9,7 +9,8 @@ anim
 Pdragonmail.111
 Pdragonmail.112
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 last_sp 13
 ac 8
 material 256
diff --git a/armour/mail/mithril_ar.arc b/armour/mail/mithril_ar.arc
index bb289554a..6c6ded790 100644
--- a/armour/mail/mithril_ar.arc
+++ b/armour/mail/mithril_ar.arc
@@ -12,7 +12,8 @@ mithril_ar.111
 mithril_ar.112
 mithril_ar.113
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 ac 6
 resist_physical 35
 last_sp 18
diff --git a/armour/mail/mithril_ar_ele.arc b/armour/mail/mithril_ar_ele.arc
index 6bcc8cacb..1bb12a914 100644
--- a/armour/mail/mithril_ar_ele.arc
+++ b/armour/mail/mithril_ar_ele.arc
@@ -15,7 +15,8 @@ mithril_ar_ele.112
 mithril_ar_ele.113
 mithril_ar_ele.113
 mina
-speed 0.3
+anim_speed 3
+client_anim_random 1
 ac 4
 resist_physical 40
 resist_electricity 30
diff --git a/armour/mail/robe_midnight.arc b/armour/mail/robe_midnight.arc
index 596a31a11..377ef0615 100644
--- a/armour/mail/robe_midnight.arc
+++ b/armour/mail/robe_midnight.arc
@@ -10,7 +10,8 @@ robe_midnight.111
 robe_midnight.112
 robe_midnight.113
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 magicmap black
 ac 5
 Dex 1
diff --git a/armour/mail/wdsm.arc b/armour/mail/wdsm.arc
index 3796f5b78..40b053646 100644
--- a/armour/mail/wdsm.arc
+++ b/armour/mail/wdsm.arc
@@ -10,7 +10,8 @@ wdsm.111
 wdsm.112
 wdsm.113
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 last_sp 13
 cursed 1
 startequip 1
diff --git a/armour/shield/DShield.arc b/armour/shield/DShield.arc
index 17c3e3200..ce8d09e7a 100644
--- a/armour/shield/DShield.arc
+++ b/armour/shield/DShield.arc
@@ -11,7 +11,8 @@ anim
 DShield.111
 DShield.112
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 msg
   There is a evil spirit in the shield.
 endmsg
diff --git a/armour/shield/DShieldm.arc b/armour/shield/DShieldm.arc
index 1caa596e7..5bf584726 100644
--- a/armour/shield/DShieldm.arc
+++ b/armour/shield/DShieldm.arc
@@ -15,7 +15,8 @@ DShield.112
 DShield.111
 DShield.113
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 msg
   There is a strong evil spirit in the shield
   trying to dominate you.
diff --git a/armour/shield/DShieldms.arc b/armour/shield/DShieldms.arc
index 7ecf03db3..ecb1b52fe 100644
--- a/armour/shield/DShieldms.arc
+++ b/armour/shield/DShieldms.arc
@@ -13,7 +13,8 @@ DShield.112
 DShield.111
 DShield.113
 mina
-speed 0.25
+anim_speed 4
+client_anim_random 1
 Cha -5
 msg
   There is a powerful evil spirit in the
diff --git a/armour/shield/DShields.arc b/armour/shield/DShields.arc
index 4b9017fd9..357e8d6fb 100644
--- a/armour/shield/DShields.arc
+++ b/armour/shield/DShields.arc
@@ -15,7 +15,8 @@ DShield.112
 DShield.111
 DShield.113
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 msg
   There is a strong evil spirit in the shield
   trying to dominate you.
diff --git a/armour/shield/reflector.arc b/armour/shield/reflector.arc
index b9943d567..ea6a0ac1d 100644
--- a/armour/shield/reflector.arc
+++ b/armour/shield/reflector.arc
@@ -12,7 +12,8 @@ reflector.112
 reflector.113
 reflector.112
 mina
-speed 0.25
+anim_speed 4
+client_anim_random 1
 ac 3
 resist_physical 5
 reflect_spell 1
diff --git a/connect/Spinner/spinner.arc b/connect/Spinner/spinner.arc
index a10599240..ff9c7c151 100644
--- a/connect/Spinner/spinner.arc
+++ b/connect/Spinner/spinner.arc
@@ -1,7 +1,8 @@
 Object spinner_-135
 name spinner
 face spinner.11B
-speed 1
+anim_speed 1
+client_anim_random 1
 type 90
 no_pick 1
 sp 3
@@ -21,7 +22,8 @@ end
 Object spinner_-90
 name spinner
 face spinner.11B
-speed 1
+anim_speed 1
+client_anim_random 1
 type 90
 no_pick 1
 sp 2
@@ -47,7 +49,8 @@ end
 Object spinner_-45
 name spinner
 face spinner.11B
-speed 0.5
+anim_speed 2
+client_anim_random 1
 type 90
 no_pick 1
 sp 1
@@ -73,7 +76,8 @@ end
 Object spinner_45
 name spinner
 face spinner.111
-speed 0.5
+anim_speed 2
+client_anim_random 1
 type 90
 no_pick 1
 sp -1
@@ -99,7 +103,8 @@ end
 Object spinner_90
 name spinner
 face spinner.111
-speed 1
+anim_speed 1
+client_anim_random 1
 type 90
 no_pick 1
 sp -2
@@ -125,7 +130,8 @@ end
 Object spinner_135
 name spinner
 face spinner.111
-speed 1
+anim_speed 1
+client_anim_random 1
 type 90
 no_pick 1
 sp -3
@@ -145,7 +151,8 @@ end
 Object spinner_180
 name spinner
 face spinner.11B
-speed 1
+anim_speed 1
+client_anim_random 1
 type 90
 no_pick 1
 sp 4
diff --git a/construct/Snow/s_barrack_u.arc b/construct/Snow/s_barrack_u.arc
index 361053977..52e6cacb9 100644
--- a/construct/Snow/s_barrack_u.arc
+++ b/construct/Snow/s_barrack_u.arc
@@ -6,7 +6,8 @@ anim
 s_barrack_u.x11
 s_barrack_u.x12
 mina
-speed -0.1
+anim_speed 1
+client_anim_random 10
 magicmap brown
 no_pick 1
 visibility 100
@@ -20,7 +21,8 @@ anim
 s_barrack_u.x11
 s_barrack_u.x12
 mina
-speed -0.1
+anim_speed 1
+client_anim_random 10
 magicmap brown
 y 1
 no_pick 1
diff --git a/construct/barrack/barrack_l.arc b/construct/barrack/barrack_l.arc
index feb59d530..2bff2cec2 100644
--- a/construct/barrack/barrack_l.arc
+++ b/construct/barrack/barrack_l.arc
@@ -6,7 +6,8 @@ anim
 barrack_l.x11
 barrack_l.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 magicmap brown
 no_pick 1
 visibility 100
@@ -21,7 +22,8 @@ anim
 barrack_l.x11
 barrack_l.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 magicmap brown
 x 1
 no_pick 1
diff --git a/construct/barrack/barrack_u.arc b/construct/barrack/barrack_u.arc
index b3d155713..a384b6679 100644
--- a/construct/barrack/barrack_u.arc
+++ b/construct/barrack/barrack_u.arc
@@ -6,7 +6,8 @@ anim
 barrack_u.x11
 barrack_u.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 magicmap brown
 no_pick 1
 visibility 100
@@ -21,7 +22,8 @@ anim
 barrack_u.x11
 barrack_u.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 magicmap brown
 y 1
 no_pick 1
diff --git a/construct/castle/castle_a.arc b/construct/castle/castle_a.arc
index 405667b7c..27e26bce6 100644
--- a/construct/castle/castle_a.arc
+++ b/construct/castle/castle_a.arc
@@ -2,7 +2,8 @@ Object castle_a
 name castle
 type 66
 face castle_a.x11
-speed -0.300
+anim_speed 3
+client_anim_random 1
 anim
 castle_a.x11
 castle_a.x12
diff --git a/construct/castle/castle_a_northwest.arc b/construct/castle/castle_a_northwest.arc
index 860e7fd63..c1b915119 100644
--- a/construct/castle/castle_a_northwest.arc
+++ b/construct/castle/castle_a_northwest.arc
@@ -2,7 +2,8 @@ Object castle_a_northwest
 name castle
 type 66
 face castle_a_northwest.x11
-speed -0.300
+anim_speed 3
+client_anim_random 1
 anim
 castle_a_northwest.x11
 castle_a_northwest.x12
diff --git a/construct/castle/castle_a_western.arc b/construct/castle/castle_a_western.arc
index 0421216d1..9e23bba7e 100644
--- a/construct/castle/castle_a_western.arc
+++ b/construct/castle/castle_a_western.arc
@@ -2,7 +2,8 @@ Object castle_a_western
 name castle
 type 66
 face castle_a_western.x11
-speed -0.300
+anim_speed 3
+client_anim_random 1
 anim
 castle_a_western.x11
 castle_a_western.x12
diff --git a/construct/fountain/fountain.arc b/construct/fountain/fountain.arc
index 7588eaf51..9fdd4da3c 100644
--- a/construct/fountain/fountain.arc
+++ b/construct/fountain/fountain.arc
@@ -8,8 +8,8 @@ fountain.112
 fountain.113
 mina
 walk_on	1
-speed 0.50
 magicmap grey
 no_pick 1
+anim_speed 2
 client_anim_random 1
 end
diff --git a/construct/keep/keep.arc b/construct/keep/keep.arc
index 67d5974ef..00fc72ccf 100644
--- a/construct/keep/keep.arc
+++ b/construct/keep/keep.arc
@@ -5,7 +5,8 @@ anim
 keep.x11
 keep.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 no_pick 1
 visibility 100
 magicmap grey
@@ -19,7 +20,8 @@ anim
 keep.x11
 keep.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 no_pick 1
 x 1
 visibility 100
@@ -33,7 +35,8 @@ anim
 keep.x11
 keep.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 no_pick 1
 y 1
 visibility 100
@@ -47,7 +50,8 @@ anim
 keep.x11
 keep.x12
 mina
-speed -0.1
+anim_speed 10
+client_anim_random 1
 no_pick 1
 x 1
 y 1
diff --git a/construct/tower/wizard_tower.arc b/construct/tower/wizard_tower.arc
index a30583e8c..548969843 100644
--- a/construct/tower/wizard_tower.arc
+++ b/construct/tower/wizard_tower.arc
@@ -7,7 +7,8 @@ wizard_tower.x11
 wizard_tower.x12
 wizard_tower.x13
 mina
-speed -0.3000
+anim_speed 3
+client_anim_random 1
 no_pick 1
 visibility 100
 magicmap grey
@@ -23,6 +24,8 @@ wizard_tower.x11
 wizard_tower.x12
 wizard_tower.x13
 mina
+anim_speed 3
+client_anim_random 1
 y 1
 no_pick 1
 visibility 100
diff --git a/exit/exit.arc b/exit/exit.arc
index d25894bdf..648472f20 100644
--- a/exit/exit.arc
+++ b/exit/exit.arc
@@ -1,7 +1,8 @@
 Object exit
 face exit.111
 magicmap blue
-speed 0.5
+anim_speed 2
+client_anim_random 1
 type 66
 no_pick 1
 anim
diff --git a/exit/fogexit.arc b/exit/fogexit.arc
index 9b6fa6b05..1147c4ce8 100644
--- a/exit/fogexit.arc
+++ b/exit/fogexit.arc
@@ -1,7 +1,8 @@
 Object fogexit
 name mysterious fog
 face fog.111
-speed 0.2
+anim_speed 5
+client_anim_random 1
 type 66
 no_pick 1
 anim
diff --git a/exit/magic_portal/magic_portal.arc b/exit/magic_portal/magic_portal.arc
index 0705f2308..a51dd125a 100644
--- a/exit/magic_portal/magic_portal.arc
+++ b/exit/magic_portal/magic_portal.arc
@@ -4,7 +4,8 @@ face magic_portal.111
 slaying /city/city
 hp 15
 sp 19
-speed 0.3
+anim_speed 3
+client_anim_random 1
 type 66
 no_pick 1
 anim
diff --git a/exit/whirlwind.arc b/exit/whirlwind.arc
index 0ed7c1c52..c1e68781f 100644
--- a/exit/whirlwind.arc
+++ b/exit/whirlwind.arc
@@ -1,7 +1,8 @@
 Object whirlwind_exit
 name whirl wind
 face stalkergen.111
-speed 0.2
+anim_speed 5
+client_anim_random 1
 type 66
 no_pick 1
 anim
diff --git a/flesh/misc/u_horn.arc b/flesh/misc/u_horn.arc
index f8e06609a..d0857d00b 100644
--- a/flesh/misc/u_horn.arc
+++ b/flesh/misc/u_horn.arc
@@ -14,6 +14,8 @@ u_horn.113
 u_horn.114
 u_horn.115
 mina
+anim_speed 2
+client_anim_random 1
 type 15
 nrof 1
 color_fg black
diff --git a/gods/items/burning_tail/burning_tail.arc b/gods/items/burning_tail/burning_tail.arc
index a2547a326..b49fda1bb 100644
--- a/gods/items/burning_tail/burning_tail.arc
+++ b/gods/items/burning_tail/burning_tail.arc
@@ -10,7 +10,8 @@ burningtail.111
 burningtail.112
 burningtail.113
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 material 256
 dam 40
 weight 10000
diff --git a/gods/items/earth_shield/shield_gaea.arc b/gods/items/earth_shield/shield_gaea.arc
index 8fe701bba..957e9e613 100644
--- a/gods/items/earth_shield/shield_gaea.arc
+++ b/gods/items/earth_shield/shield_gaea.arc
@@ -16,7 +16,8 @@ msg
 endmsg
 is_animated 1
 ac 4
-speed 0.2
+anim_speed 5
+client_anim_random 1
 nrof 1
 startequip 1
 type 33
diff --git a/gods/items/glovesofsun/glovesofsun.arc b/gods/items/glovesofsun/glovesofsun.arc
index cf3d2b858..971e285fd 100644
--- a/gods/items/glovesofsun/glovesofsun.arc
+++ b/gods/items/glovesofsun/glovesofsun.arc
@@ -14,7 +14,8 @@ glovesofsun.111
 glovesofsun.112
 glovesofsun.113
 mina
-speed 0.25
+anim_speed 4
+client_anim_random 1
 material 8
 weight 900
 value 20000
diff --git a/gods/items/mithril_ar_ele_sorig.arc b/gods/items/mithril_ar_ele_sorig.arc
index d3c690bc3..4370833a5 100644
--- a/gods/items/mithril_ar_ele_sorig.arc
+++ b/gods/items/mithril_ar_ele_sorig.arc
@@ -4,7 +4,8 @@ name mithril chainmail of lightning of Sorig
 type 16
 face mithril_ar_ele.111
 animation mithril_ar_ele
-speed 0.3
+anim_speed 3
+client_anim_random 1
 ac 4
 resist_physical 40
 resist_electricity 40
diff --git a/gods/items/spear_ixalovh.arc b/gods/items/spear_ixalovh.arc
index 46a0c8434..360e674dc 100644
--- a/gods/items/spear_ixalovh.arc
+++ b/gods/items/spear_ixalovh.arc
@@ -10,7 +10,8 @@ spear_ixalovh.111
 spear_ixalovh.112
 spear_ixalovh.113
 mina
-speed -0.02
+anim_speed 10
+client_anim_random 1
 Pow 1
 sp 1
 material 256
diff --git a/gods/items/tear_gaea.arc b/gods/items/tear_gaea.arc
index ae96c0e48..da7d894ba 100644
--- a/gods/items/tear_gaea.arc
+++ b/gods/items/tear_gaea.arc
@@ -9,7 +9,8 @@ tear.114
 mina
 nrof 1
 level 10
-speed 0.25
+anim_speed 4
+client_anim_random 1
 color_fg blue
 type 5
 sp 35
diff --git a/ground/blood_sea.arc b/ground/blood_sea.arc
index 947339f2c..4664e7e63 100644
--- a/ground/blood_sea.arc
+++ b/ground/blood_sea.arc
@@ -16,7 +16,8 @@ smoothface blood_sea.111 blood_sea_S.111
 smoothface blood_sea.112 blood_sea_S.112
 smoothface blood_sea.113 blood_sea_S.113
 smoothface blood_sea.114 blood_sea_S.114
-speed 0.2
+anim_speed 5
+client_anim_sync 1
 move_block all
 no_pick 1
 is_water 1
diff --git a/ground/deep_sea.arc b/ground/deep_sea.arc
index f23687afb..7a8a86196 100644
--- a/ground/deep_sea.arc
+++ b/ground/deep_sea.arc
@@ -14,7 +14,8 @@ smoothface deep_sea.111 deep_sea_S.111
 smoothface deep_sea.112 deep_sea_S.112
 smoothface deep_sea.113 deep_sea_S.113
 smoothface deep_sea.114 deep_sea_S.114
-speed 0.2
+anim_speed 5
+client_anim_sync 1
 move_block all
 no_pick 1
 is_water 1
diff --git a/ground/glue.arc b/ground/glue.arc
index 8f431d054..1695cd7a8 100644
--- a/ground/glue.arc
+++ b/ground/glue.arc
@@ -1,6 +1,7 @@
 Object glue
 face glue.111
-speed -0.06
+anim_speed 15
+client_anim_random 1
 anim
 glue.111
 glue.112
diff --git a/ground/oil_sea.arc b/ground/oil_sea.arc
index ed1efe8b0..5f9c5058b 100644
--- a/ground/oil_sea.arc
+++ b/ground/oil_sea.arc
@@ -16,7 +16,8 @@ smoothface oil_sea.111 oil_sea_S.111
 smoothface oil_sea.112 oil_sea_S.112
 smoothface oil_sea.113 oil_sea_S.113
 smoothface oil_sea.114 oil_sea_S.114
-speed 0.1
+anim_speed 10
+client_anim_sync 1
 move_block all
 no_pick 1
 is_water 1
@@ -44,7 +45,8 @@ smoothface oil_sea.111 oil_sea_S.111
 smoothface oil_sea.112 oil_sea_S.112
 smoothface oil_sea.113 oil_sea_S.113
 smoothface oil_sea.114 oil_sea_S.114
-speed 0.01
+anim_speed 10
+client_anim_sync 1
 no_pick 1
 is_water 1
 is_floor 1
diff --git a/ground/quicksilver_sea.arc b/ground/quicksilver_sea.arc
index ddd1edafe..82e13f87b 100644
--- a/ground/quicksilver_sea.arc
+++ b/ground/quicksilver_sea.arc
@@ -16,7 +16,8 @@ smoothface quicksilver_sea.111 quicksilver_sea_S.111
 smoothface quicksilver_sea.112 quicksilver_sea_S.112
 smoothface quicksilver_sea.113 quicksilver_sea_S.113
 smoothface quicksilver_sea.114 quicksilver_sea_S.114
-speed 0.35
+anim_speed 3
+client_anim_sync 1
 move_block all
 no_pick 1
 is_water 1
diff --git a/ground/sea.arc b/ground/sea.arc
index 8e4bb804a..c1a31bf21 100644
--- a/ground/sea.arc
+++ b/ground/sea.arc
@@ -14,13 +14,13 @@ smoothface sea.113 sea_S.113
 smoothface sea.114 sea_S.114
 color_fg light_blue
 color_bg blue
-speed 0.2
 move_block all -boat
 no_pick 1
 is_water 1
 is_floor 1
 smoothlevel 20
 client_anim_sync 1
+anim_speed 5
 end
 Object sea1
 name sea
@@ -39,12 +39,12 @@ smoothface sea.113 sea_S.113
 smoothface sea.114 sea_S.114
 color_fg light_blue
 color_bg blue
-speed 0.2
 no_pick 1
 is_water 1
 is_floor 1
 smoothlevel 20
 client_anim_sync 1
+anim_speed 5
 end
 Object sea_nw
 name sea
diff --git a/ground/shallow_sea.arc b/ground/shallow_sea.arc
index f6ab95e02..f95d5414c 100644
--- a/ground/shallow_sea.arc
+++ b/ground/shallow_sea.arc
@@ -14,7 +14,8 @@ smoothface shallow_sea.113 shallow_sea_S.113
 smoothface shallow_sea.114 shallow_sea_S.114
 magicmap light_blue
 smoothlevel 19
-speed 0.2
+anim_speed 5
+client_anim_sync 1
 move_block all
 no_pick 1
 is_water 1
diff --git a/ground/spider_web.arc b/ground/spider_web.arc
index dd1fd7c8d..440dcef45 100644
--- a/ground/spider_web.arc
+++ b/ground/spider_web.arc
@@ -1,7 +1,8 @@
 Object spider_web
 name spider web
 face spider_web.111
-speed -0.01
+anim_speed 20
+client_anim_sync 1
 anim
 spider_web.111
 spider_web.112
diff --git a/indoor/clock.arc b/indoor/clock.arc
index e8ac34d5b..34d7b384e 100644
--- a/indoor/clock.arc
+++ b/indoor/clock.arc
@@ -6,7 +6,8 @@ anim
 clock.111
 clock.112
 mina
-speed -0.05
+anim_speed 20
+client_anim_random 1
 weight 80000
 value 100
 material 20
diff --git a/indoor/clock_ag.arc b/indoor/clock_ag.arc
index 54ffd54cd..6ab48be82 100644
--- a/indoor/clock_ag.arc
+++ b/indoor/clock_ag.arc
@@ -7,7 +7,8 @@ anim
 clock_ag.111
 clock_ag.112
 mina
-speed -0.05
+anim_speed 20
+client_anim_random 1
 weight 320000
 value 52890
 material 20
diff --git a/indoor/clock_cw.arc b/indoor/clock_cw.arc
index 4a87c507f..3d96a2c89 100644
--- a/indoor/clock_cw.arc
+++ b/indoor/clock_cw.arc
@@ -7,7 +7,8 @@ anim
 clock_cw.111
 clock_cw.112
 mina
-speed -0.05
+anim_speed 20
+client_anim_random 1
 weight 80000
 value 1400
 material 20
diff --git a/indoor/clock_grand.arc b/indoor/clock_grand.arc
index d958c8087..bf485a7b1 100644
--- a/indoor/clock_grand.arc
+++ b/indoor/clock_grand.arc
@@ -7,7 +7,8 @@ anim
 clock_grand.111
 clock_grand.112
 mina
-speed -0.05
+anim_speed 20
+client_anim_random 1
 weight 80000
 value 500
 material 20
diff --git a/inorganic/dust_effect.arc b/inorganic/dust_effect.arc
index 6c6fac42a..be1fbab76 100644
--- a/inorganic/dust_effect.arc
+++ b/inorganic/dust_effect.arc
@@ -10,7 +10,8 @@ dust_effect.111
 dust_effect.112
 dust_effect.113
 mina
-speed 1
+anim_speed 1
+client_anim_random 1
 attacktype 4194304
 wc -3
 dam 1
diff --git a/inorganic/mercury.arc b/inorganic/mercury.arc
index 6fafd942c..535fdc081 100644
--- a/inorganic/mercury.arc
+++ b/inorganic/mercury.arc
@@ -22,7 +22,8 @@ anim
 fix_mercury.111
 fix_mercury.112
 mina
-speed 0.5
+anim_speed 2
+client_anim_random 1
 material 512
 materialname mercury
 value 400
diff --git a/inorganic/phil_minerals.arc b/inorganic/phil_minerals.arc
index 00e7ab3e8..d5ef2a2b7 100644
--- a/inorganic/phil_minerals.arc
+++ b/inorganic/phil_minerals.arc
@@ -7,11 +7,11 @@ material 4
 type 73
 value 280
 resist_fire -100
-
 weight 500
 name_pl bottles
 client_type 642
 end
+
 Object phil_sulphur
 name pile
 title of philosophical sulphur
@@ -24,17 +24,17 @@ phil_sulphur.113
 mina
 material 64
 type 73
-speed -0.35
+anim_speed 3
+client_anim_random 1
 value 110
 color_fg yellow
 resist_fire -100
-
 resist_acid 100
-
 weight 500
 name_pl piles
 client_type 642
 end
+
 Object phil_phosphorus
 name pile
 title of philosophical phosphorus
@@ -46,19 +46,19 @@ phil_phos.112
 phil_phos.113
 mina
 material 64
-speed -0.45
+anim_speed 2
+client_anim_random 1
 type 73
 value 350
 color_fg grey
 resist_fire -100
 resist_electricity -100
-
 resist_acid 100
-
 weight 1000
 name_pl piles
 client_type 642
 end
+
 Object phil_salt
 name pile
 title of philosophical salt
@@ -71,7 +71,8 @@ phil_salt.113
 mina
 material 64
 type 73
-speed -0.30
+anim_speed 3
+client_anim_random 1
 value 80
 color_fg white
 weight 500
diff --git a/jewel/amethyst.arc b/jewel/amethyst.arc
index ec1a66692..658c7e4b7 100644
--- a/jewel/amethyst.arc
+++ b/jewel/amethyst.arc
@@ -9,7 +9,8 @@ amethyst.112
 mina
 color_fg green
 nrof 1
-speed -0.1
+anim_speed 10
+client_anim_random 1
 value 126
 weight 50
 material 64
diff --git a/jewel/emerald.arc b/jewel/emerald.arc
index fac312387..fc2e42993 100644
--- a/jewel/emerald.arc
+++ b/jewel/emerald.arc
@@ -8,7 +8,8 @@ emerald.112
 mina
 color_fg green
 nrof 1
-speed -0.1
+anim_speed 10
+client_anim_random 1
 value 160
 weight 50
 identified 1
diff --git a/jewel/gem.arc b/jewel/gem.arc
index da934851a..fd0621de3 100644
--- a/jewel/gem.arc
+++ b/jewel/gem.arc
@@ -9,7 +9,8 @@ gem.112
 mina
 color_fg green
 nrof 1
-speed -0.1
+anim_speed 10
+client_anim_random 1
 value 400
 weight 50
 material 64
diff --git a/jewel/mithril.arc b/jewel/mithril.arc
index 2ce9d2e16..15673ed82 100644
--- a/jewel/mithril.arc
+++ b/jewel/mithril.arc
@@ -10,7 +10,8 @@ mithril.113
 mithril.114
 mina
 nrof 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 value 800
 weight 50
 material 2
diff --git a/jewel/pearl.arc b/jewel/pearl.arc
index d31c687c4..fc83c7ed0 100644
--- a/jewel/pearl.arc
+++ b/jewel/pearl.arc
@@ -8,7 +8,8 @@ pearl.112
 mina
 color_fg white
 nrof 1
-speed -0.1
+anim_speed 10
+client_anim_random 1
 value 50
 weight 50
 material 64
diff --git a/jewel/ruby.arc b/jewel/ruby.arc
index 7ea4469fe..b20f11a80 100644
--- a/jewel/ruby.arc
+++ b/jewel/ruby.arc
@@ -8,7 +8,8 @@ ruby.112
 mina
 color_fg red
 nrof 1
-speed -0.1
+anim_speed 10
+client_anim_random 1
 value 200
 weight 50
 identified 1
diff --git a/jewel/sapphire.arc b/jewel/sapphire.arc
index 0b09d7dba..385fcb26b 100644
--- a/jewel/sapphire.arc
+++ b/jewel/sapphire.arc
@@ -8,7 +8,8 @@ sapphire.112
 mina
 color_fg blue
 nrof 1
-speed -0.1
+anim_speed 10
+client_anim_random 1
 value 185
 weight 50
 identified 1
diff --git a/light/torch.arc b/light/torch.arc
index 085740171..9de69c328 100644
--- a/light/torch.arc
+++ b/light/torch.arc
@@ -14,6 +14,7 @@ magicmap brown
 name_pl torches
 client_type 1102
 end
+
 Object torch_1
 name torch
 face torch_lit1.111
@@ -28,11 +29,13 @@ changing 1
 value 0
 weight 500
 speed 0.15
+client_anim_random 1
 glow_radius 3
 magicmap orange
 name_pl torches
 client_type 1102
 end
+
 Object dim_torch
 name torch
 face torch_lit2.111
@@ -47,11 +50,13 @@ changing 1
 value 0
 weight 500
 speed 0.15
+client_anim_random 1
 glow_radius 2
 is_lightable 1
 name_pl torches
 client_type 1102
 end
+
 Object burnt_torch
 name burnt out torch
 face torch_unlit.111
diff --git a/misc/Bagpipe/bagpipe.arc b/misc/Bagpipe/bagpipe.arc
index dcb109fa9..3186379bd 100644
--- a/misc/Bagpipe/bagpipe.arc
+++ b/misc/Bagpipe/bagpipe.arc
@@ -17,7 +17,8 @@ bagpipe.118
 bagpipe.119
 bagpipe.11A
 mina
-speed -0.3
+anim_speed 3
+client_anim_random 1
 weight 3000
 value 1000
 magicmap orange
diff --git a/misc/Camp/campfire.arc b/misc/Camp/campfire.arc
index 7c9ec9965..11b0b3520 100644
--- a/misc/Camp/campfire.arc
+++ b/misc/Camp/campfire.arc
@@ -19,6 +19,7 @@ glow_radius 2
 no_pick 1
 color_fg yellow
 end
+
 Object campfire_talking
 name talking campfire
 randomitems campfire_talking
@@ -33,9 +34,11 @@ mina
 glow_radius 2
 no_pick 1
 color_fg yellow
-speed -0.3
+anim_speed 3
+client_anim_random 1
 is_animated 1
 end
+
 Object campfire_say
 type 116
 subtype 6
diff --git a/misc/Container/forge.arc b/misc/Container/forge.arc
index 7fd5f7e76..fbe14fdbd 100644
--- a/misc/Container/forge.arc
+++ b/misc/Container/forge.arc
@@ -5,7 +5,8 @@ forge.111
 forge.112
 forge.113
 mina
-speed -0.2
+anim_speed 5
+client_anim_random 1
 glow_radius 1
 no_pick 1
 type 122
diff --git a/misc/Container/luggage.arc b/misc/Container/luggage.arc
index bbe5fc3ba..87a23d094 100644
--- a/misc/Container/luggage.arc
+++ b/misc/Container/luggage.arc
@@ -11,7 +11,8 @@ luggage.116
 luggage.117
 luggage.118
 mina
-speed 0.5
+anim_speed 2
+client_anim_random 1
 type 122
 material 2
 value 100000
diff --git a/misc/Container/stove.arc b/misc/Container/stove.arc
index 698566b20..9e005915a 100755
--- a/misc/Container/stove.arc
+++ b/misc/Container/stove.arc
@@ -5,7 +5,8 @@ stove.111
 stove.112
 stove.113
 mina
-speed -0.2
+anim_speed 5
+client_anim_random 1
 glow_radius 1
 no_pick 1
 type 122
diff --git a/misc/brazier.arc b/misc/brazier.arc
index 1d04e96ec..805f317f0 100644
--- a/misc/brazier.arc
+++ b/misc/brazier.arc
@@ -6,7 +6,8 @@ brazier.112
 brazier.113
 brazier.114
 mina
-speed -0.2
+anim_speed 5
+client_anim_random 1
 glow_radius 3
 no_pick 1
 move_block all
diff --git a/misc/chalice.arc b/misc/chalice.arc
index 16ac7bfcf..976b36ba6 100644
--- a/misc/chalice.arc
+++ b/misc/chalice.arc
@@ -6,7 +6,8 @@ weight 23700
 is_animated 1
 material 2
 value 2500
-speed 0.2
+anim_speed 5
+client_anim_random 1
 anim
 chalice.111
 chalice.111
diff --git a/misc/chalice2.arc b/misc/chalice2.arc
index 67a80bb10..46d8953a0 100644
--- a/misc/chalice2.arc
+++ b/misc/chalice2.arc
@@ -7,7 +7,8 @@ is_animated 1
 material 2
 materialname silver
 value 1200
-speed 0.2
+anim_speed 5
+client_anim_random 1
 anim
 chalice_sil.111
 chalice_sil.111
@@ -21,6 +22,7 @@ name chalice
 name_pl chalices
 client_type 2030
 end
+
 Object chalice_cop
 face chalice_cop.111
 type 60
@@ -30,7 +32,8 @@ is_animated 1
 material 2
 materialname copper
 value 500
-speed 0.2
+anim_speed 5
+client_anim_random 1
 anim
 chalice_cop.111
 chalice_cop.111
@@ -44,6 +47,7 @@ name chalice
 name_pl chalices
 client_type 2030
 end
+
 Object chalice_bro
 face chalice_bro.111
 type 60
@@ -53,7 +57,8 @@ is_animated 1
 material 2
 materialname bronze
 value 700
-speed 0.2
+anim_speed 5
+client_anim_random 1
 anim
 chalice_bro.111
 chalice_bro.111
@@ -67,6 +72,7 @@ name chalice
 name_pl chalices
 client_type 2030
 end
+
 Object chalice_iro
 face chalice_iro.111
 type 60
@@ -76,7 +82,8 @@ is_animated 1
 material 2
 materialname iron
 value 200
-speed 0.2
+anim_speed 5
+client_anim_random 1
 anim
 chalice_iro.111
 chalice_iro.111
@@ -90,6 +97,7 @@ name chalice
 name_pl chalices
 client_type 2030
 end
+
 Object chalice_tin
 face chalice_tin.111
 type 60
@@ -99,7 +107,8 @@ is_animated 1
 material 2
 materialname tin
 value 50
-speed 0.2
+anim_speed 5
+client_anim_random 1
 anim
 chalice_tin.111
 chalice_tin.111
@@ -113,6 +122,7 @@ name chalice
 name_pl chalices
 client_type 2030
 end
+
 Object chalice_plat
 face chalice_plat.111
 type 60
@@ -122,7 +132,8 @@ is_animated 1
 material 2
 materialname platinum
 value 5000
-speed 0.2
+anim_speed 5
+client_anim_random 1
 anim
 chalice_plat.111
 chalice_plat.111
diff --git a/misc/chandelier_2.arc b/misc/chandelier_2.arc
index 95c4f205e..820a69927 100644
--- a/misc/chandelier_2.arc
+++ b/misc/chandelier_2.arc
@@ -7,7 +7,8 @@ chandelier_2.112
 chandelier_2.113
 chandelier_2.114
 mina
-speed -0.30
+anim_speed 3
+client_anim_random 1
 glow_radius 4
 no_pick 1
 color_fg yellow
@@ -22,7 +23,8 @@ chandelier_2_copper.112
 chandelier_2_copper.113
 chandelier_2_copper.114
 mina
-speed -0.30
+anim_speed 3
+client_anim_random 1
 glow_radius 4
 no_pick 1
 color_fg yellow
diff --git a/misc/dice.arc b/misc/dice.arc
index b72317345..a6506a1e7 100644
--- a/misc/dice.arc
+++ b/misc/dice.arc
@@ -5,7 +5,8 @@ dice.111
 dice.112
 dice.113
 mina
-speed -0.2
+anim_speed 5
+client_anim_random 1
 name dice
 nrof 1
 is_animated 1
diff --git a/misc/fireplace.arc b/misc/fireplace.arc
index a3d08e748..ad8f9fb30 100644
--- a/misc/fireplace.arc
+++ b/misc/fireplace.arc
@@ -5,7 +5,8 @@ fireplace.111
 fireplace.112
 fireplace.113
 mina
-speed -0.2
+anim_speed 5
+client_anim_random 1
 glow_radius 2
 no_pick 1
 move_block all
diff --git a/misc/firepot.arc b/misc/firepot.arc
index 8e6ca5449..6779f7143 100644
--- a/misc/firepot.arc
+++ b/misc/firepot.arc
@@ -6,7 +6,8 @@ firepot.112
 firepot.113
 firepot.114
 mina
-speed -0.30
+anim_speed 3
+client_anim_random 1
 no_pick 1
 move_block all
 glow_radius 3
diff --git a/misc/hangingfirepot.arc b/misc/hangingfirepot.arc
index d14a24b69..955182557 100644
--- a/misc/hangingfirepot.arc
+++ b/misc/hangingfirepot.arc
@@ -7,7 +7,8 @@ hangingfirepot.112
 hangingfirepot.113
 hangingfirepot.114
 mina
-speed -0.30
+anim_speed 3
+client_anim_random 1
 glow_radius 3
 no_pick 1
 color_fg red
diff --git a/misc/thewheel/thewheel.arc b/misc/thewheel/thewheel.arc
index 2c375d136..554dfcb6c 100644
--- a/misc/thewheel/thewheel.arc
+++ b/misc/thewheel/thewheel.arc
@@ -28,7 +28,8 @@ name the wheel
 is_animated 1
 no_pick 1
 move_block all
-speed -0.1
+anim_speed 10
+client_anim_random 1
 anim
 thewheel_short.111
 thewheel_short.111
@@ -59,7 +60,8 @@ name the wheel
 is_animated 1
 no_pick 1
 move_block all
-speed -0.1
+anim_speed 10
+client_anim_random 1
 anim
 thewheel_tall.x11
 thewheel_tall.x11
@@ -89,7 +91,8 @@ face thewheel_tall.x11
 name the wheel
 is_animated 1
 no_pick 1
-speed -0.1
+anim_speed 10
+client_anim_random 1
 anim
 thewheel_tall.x11
 thewheel_tall.x11
diff --git a/misc/torch_cyan.arc b/misc/torch_cyan.arc
index cce1d63a3..b2ff8f928 100644
--- a/misc/torch_cyan.arc
+++ b/misc/torch_cyan.arc
@@ -10,7 +10,8 @@ color_fg light_blue
 material 144
 value 0
 weight 3000
-speed 0.1
+anim_speed 10
+client_anim_random 1
 name_pl torches of cyan light
 client_type 1103
 end
diff --git a/misc/torch_indigo.arc b/misc/torch_indigo.arc
index c07f0792a..b5de06c59 100644
--- a/misc/torch_indigo.arc
+++ b/misc/torch_indigo.arc
@@ -10,7 +10,8 @@ color_fg blue
 material 144
 value 0
 weight 3000
-speed 0.1
+anim_speed 10
+client_anim_random 1
 name_pl torches of indigo light
 client_type 1103
 end
diff --git a/misc/torch_vermilion.arc b/misc/torch_vermilion.arc
index 30080de55..a0b0c81ba 100644
--- a/misc/torch_vermilion.arc
+++ b/misc/torch_vermilion.arc
@@ -10,7 +10,8 @@ color_fg red
 material 144
 value 0
 weight 3000
-speed 0.1
+anim_speed 10
+client_anim_random 1
 name_pl torches of vermilion light
 client_type 1103
 end
diff --git a/planes/fire/burning_fountain.arc b/planes/fire/burning_fountain.arc
index 3ceec9148..11e7be291 100644
--- a/planes/fire/burning_fountain.arc
+++ b/planes/fire/burning_fountain.arc
@@ -8,7 +8,8 @@ burning_fountain.112
 burning_fountain.113
 mina
 walk_on	1
-speed 0.50
+anim_speed 2
+client_anim_random 1
 color_fg grey
 no_pick 1
 end
diff --git a/planes/fire/burningwall/burningwall.arc b/planes/fire/burningwall/burningwall.arc
index 4dee71004..890ef490e 100644
--- a/planes/fire/burningwall/burningwall.arc
+++ b/planes/fire/burningwall/burningwall.arc
@@ -6,7 +6,8 @@ burningwall_0.111
 burningwall_0.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -21,7 +22,8 @@ burningwall_1.111
 burningwall_1.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -36,7 +38,8 @@ burningwall_2.111
 burningwall_2.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -51,7 +54,8 @@ burningwall_3.111
 burningwall_3.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -66,7 +70,8 @@ burningwall_4.111
 burningwall_4.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -81,7 +86,8 @@ burningwall_5.111
 burningwall_5.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -96,7 +102,8 @@ burningwall_6.111
 burningwall_6.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -111,7 +118,8 @@ burningwall_7.111
 burningwall_7.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -126,7 +134,8 @@ burningwall_8.111
 burningwall_8.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -141,7 +150,8 @@ burningwall_9.111
 burningwall_9.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -156,7 +166,8 @@ burningwall_A.111
 burningwall_A.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -171,7 +182,8 @@ burningwall_B.111
 burningwall_B.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -186,7 +198,8 @@ burningwall_C.111
 burningwall_C.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -201,7 +214,8 @@ burningwall_D.111
 burningwall_D.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -216,7 +230,8 @@ burningwall_E.111
 burningwall_E.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
@@ -231,7 +246,8 @@ burningwall_F.111
 burningwall_F.112
 mina
 is_animated 1
-speed 0.2
+anim_speed 5
+client_anim_random 1
 color_fg brown
 move_block all
 no_pick 1
diff --git a/planes/fire/flaming_tower.arc b/planes/fire/flaming_tower.arc
index e5cb73d1e..33d9c1ea9 100644
--- a/planes/fire/flaming_tower.arc
+++ b/planes/fire/flaming_tower.arc
@@ -17,7 +17,8 @@ flamingtower.x14
 flamingtower.x12
 mina
 is_animated 1
-speed 0.5
+anim_speed 2
+client_anim_random 1
 no_pick 1
 visibility 100
 magicmap grey
@@ -43,7 +44,8 @@ flamingtower.x14
 flamingtower.x12
 mina
 is_animated 1
-speed 0.5
+anim_speed 2
+client_anim_random 1
 no_pick 1
 y 1
 visibility 100
diff --git a/planes/fire/lava/lava_sea.arc b/planes/fire/lava/lava_sea.arc
index fd43c9d27..76894f5f6 100644
--- a/planes/fire/lava/lava_sea.arc
+++ b/planes/fire/lava/lava_sea.arc
@@ -9,12 +9,14 @@ lava_sea.114
 mina
 color_fg light_blue
 color_bg blue
-speed 0.2
+anim_speed 5
+client_anim_random 1
 move_block all
 no_pick 1
 is_water 1
 is_floor 1
 end
+
 Object lava_sea1
 name lava
 face lava_sea.111
@@ -26,7 +28,8 @@ lava_sea.114
 mina
 color_fg light_blue
 color_bg blue
-speed 0.2
+anim_speed 5
+client_anim_random 1
 no_pick 1
 is_water 1
 is_floor 1
diff --git a/shop/alchemy_gems.arc b/shop/alchemy_gems.arc
index 5498e2b2b..bbace60f7 100644
--- a/shop/alchemy_gems.arc
+++ b/shop/alchemy_gems.arc
@@ -19,10 +19,12 @@ polymorph.113
 polymorph.114
 gem.111
 mina
-speed 0.4
+anim_speed 2
+client_anim_random 1
 walk_on 1
 visibility 100
 end
+
 Object alchemy_ruby_converter
 name alchemy bath: create ruby
 other_arch ruby
@@ -44,10 +46,12 @@ polymorph.113
 polymorph.114
 ruby.111
 mina
-speed 0.4
+anim_speed 2
+client_anim_random 1
 walk_on 1
 visibility 100
 end
+
 Object alchemy_pearl_converter
 name alchemy bath: create pearl
 other_arch pearl
@@ -69,7 +73,8 @@ polymorph.113
 polymorph.114
 pearl.111
 mina
-speed 0.4
+anim_speed 2
+client_anim_random 1
 walk_on 1
 visibility 100
 end
diff --git a/spell/Cone/spiderweb.arc b/spell/Cone/spiderweb.arc
index 2c213b2c3..de92767dc 100644
--- a/spell/Cone/spiderweb.arc
+++ b/spell/Cone/spiderweb.arc
@@ -22,4 +22,6 @@ animation spider_web
 no_pick 1
 slow_move 7
 material 128
+anim_speed 10
+client_anim_random 1
 end
diff --git a/spell/Wand/staff.arc b/spell/Wand/staff.arc
index 52f044938..c4218e2ed 100644
--- a/spell/Wand/staff.arc
+++ b/spell/Wand/staff.arc
@@ -15,7 +15,8 @@ staff.112
 staff.111
 mina
 color_fg brown
-speed -0.1
+anim_speed 10
+client_anim_random 1
 type 109
 value 50
 weight 2500
diff --git a/spell/Wand/wand.arc b/spell/Wand/wand.arc
index b45657217..e4252002f 100644
--- a/spell/Wand/wand.arc
+++ b/spell/Wand/wand.arc
@@ -5,7 +5,8 @@ wand.112
 wand.113
 mina
 color_fg brown
-speed -0.1
+anim_speed 10
+client_anim_random 1
 type 109
 value 50
 weight 2300
diff --git a/spell/fire_permanent.arc b/spell/fire_permanent.arc
index a909d35ab..1e773bd04 100644
--- a/spell/fire_permanent.arc
+++ b/spell/fire_permanent.arc
@@ -12,7 +12,8 @@ burnout.117
 burnout.118
 burnout.119
 mina
-speed 1
+anim_speed 1
+client_anim_random 1
 color_fg red
 no_pick 1
 end
diff --git a/talisman/collar.arc b/talisman/collar.arc
index bf5ba2165..557ca3ee4 100644
--- a/talisman/collar.arc
+++ b/talisman/collar.arc
@@ -8,7 +8,8 @@ collar.112
 collar.113
 collar.112
 mina
-speed .3
+anim_speed 3
+client_anim_random 1
 color_fg red
 type 39
 material 12
diff --git a/talisman/ring_drain.arc b/talisman/ring_drain.arc
index 2b570a5be..8859ac57b 100644
--- a/talisman/ring_drain.arc
+++ b/talisman/ring_drain.arc
@@ -16,7 +16,8 @@ type 70
 material 2
 resist_drain 100
 nrof 1
-speed 0.1
+anim_speed 10
+client_anim_random 1
 client_type 390
 body_finger -1
 item_power 4
diff --git a/transport/dragonexit.arc b/transport/dragonexit.arc
index ddd157ea4..ceeb3fb16 100644
--- a/transport/dragonexit.arc
+++ b/transport/dragonexit.arc
@@ -2,7 +2,8 @@ Object dragon_exit
 name dragon
 face dragon.x71
 type 66
-speed 0.4
+anim_speed 2
+client_anim_random 1
 anim
 dragon.x71
 dragon.x72
diff --git a/weapon/artifact/ChaosSword/CSword.arc b/weapon/artifact/ChaosSword/CSword.arc
index a8a124598..3513e618a 100644
--- a/weapon/artifact/ChaosSword/CSword.arc
+++ b/weapon/artifact/ChaosSword/CSword.arc
@@ -19,7 +19,8 @@ CSword.11C
 CSword.111
 CSword.112
 mina
-speed 0.3
+anim_speed 3
+client_anim_random 1
 material 2
 weight 20000
 Str 1
diff --git a/weapon/artifact/Darkblade/darkblade.arc b/weapon/artifact/Darkblade/darkblade.arc
index 4a98e97e6..e980cdbcb 100644
--- a/weapon/artifact/Darkblade/darkblade.arc
+++ b/weapon/artifact/Darkblade/darkblade.arc
@@ -18,7 +18,8 @@ darkblade.113
 darkblade.112
 darkblade.111
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 Cha -1
 Con 2
 hp 1
diff --git a/weapon/artifact/Demonbane/demonbane.arc b/weapon/artifact/Demonbane/demonbane.arc
index a66d7869b..d3c251de9 100644
--- a/weapon/artifact/Demonbane/demonbane.arc
+++ b/weapon/artifact/Demonbane/demonbane.arc
@@ -16,7 +16,8 @@ demonbane.117
 demonbane.118
 demonbane.119
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 material 2
 dam 11
 magic 3
diff --git a/weapon/artifact/Fdagger/dagger_f.arc b/weapon/artifact/Fdagger/dagger_f.arc
index 48ea7bbd1..011deeb4e 100644
--- a/weapon/artifact/Fdagger/dagger_f.arc
+++ b/weapon/artifact/Fdagger/dagger_f.arc
@@ -8,7 +8,8 @@ dagger_f.112
 dagger_f.113
 dagger_f.114
 mina
-speed .2
+anim_speed 5
+client_anim_random 1
 Cha 4
 dam 2
 luck 3
diff --git a/weapon/artifact/Fhammer/frost_hammer.arc b/weapon/artifact/Fhammer/frost_hammer.arc
index 70525bbe0..7a31adf90 100644
--- a/weapon/artifact/Fhammer/frost_hammer.arc
+++ b/weapon/artifact/Fhammer/frost_hammer.arc
@@ -11,7 +11,8 @@ frost_hammer.112
 frost_hammer.113
 frost_hammer.114
 mina
-speed .4
+anim_speed 2
+client_anim_random 1
 material 256
 materialname glacium
 dam 10
diff --git a/weapon/artifact/Firestar/fakefirestar.arc b/weapon/artifact/Firestar/fakefirestar.arc
index 9dabcef3c..83c0bf82d 100644
--- a/weapon/artifact/Firestar/fakefirestar.arc
+++ b/weapon/artifact/Firestar/fakefirestar.arc
@@ -11,7 +11,8 @@ firestar.112
 firestar.113
 mina
 weapontype 7
-speed 0.2
+anim_speed 5
+client_anim_random 1
 type 15
 last_sp 9
 face firestar.111
diff --git a/weapon/artifact/Firestar/firestar.arc b/weapon/artifact/Firestar/firestar.arc
index 7cbe438b4..6f17c81af 100644
--- a/weapon/artifact/Firestar/firestar.arc
+++ b/weapon/artifact/Firestar/firestar.arc
@@ -12,7 +12,8 @@ firestar.112
 firestar.113
 mina
 weapontype 7
-speed 0.30
+anim_speed 3
+client_anim_random 1
 type 15
 last_sp 9
 face firestar.111
diff --git a/weapon/artifact/Gram/gram.arc b/weapon/artifact/Gram/gram.arc
index fe73b6bab..c355ad383 100644
--- a/weapon/artifact/Gram/gram.arc
+++ b/weapon/artifact/Gram/gram.arc
@@ -10,7 +10,8 @@ gram.112
 gram.113
 gram.114
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 material 2
 dam 18
 exp 1
diff --git a/weapon/artifact/HolyAvenger/holyave.arc b/weapon/artifact/HolyAvenger/holyave.arc
index 7c315b5c8..cb879029b 100644
--- a/weapon/artifact/HolyAvenger/holyave.arc
+++ b/weapon/artifact/HolyAvenger/holyave.arc
@@ -16,7 +16,8 @@ holyave.11A
 holyave.11B
 holyave.11C
 mina
-speed 0.2
+anim_speed 5
+client_anim_random 1
 last_sp 9
 dam 15
 type 15
diff --git a/weapon/artifact/Lslasher/lava_s.arc b/weapon/artifact/Lslasher/lava_s.arc
index d283cee41..7508764a3 100644
--- a/weapon/artifact/Lslasher/lava_s.arc
+++ b/weapon/artifact/Lslasher/lava_s.arc
@@ -10,7 +10,8 @@ mina
 Str 2
 Con 2
 dam 30
-speed 0.250000
+anim_speed 4
+client_anim_random 1
 type 15
 resist_cold 75
 attacktype 5
diff --git a/weapon/artifact/Masamune/masamune.arc b/weapon/artifact/Masamune/masamune.arc
index b07155c9a..dfc308788 100644
--- a/weapon/artifact/Masamune/masamune.arc
+++ b/weapon/artifact/Masamune/masamune.arc
@@ -10,7 +10,8 @@ masamune.111
 masamune.114
 masamune.114
 mina
-speed .2
+anim_speed 5
+client_anim_random 1
 slaying undead
 last_sp 3
 Str 2
diff --git a/weapon/artifact/Sting/sting.arc b/weapon/artifact/Sting/sting.arc
index 0fb237ec9..36c2e11da 100644
--- a/weapon/artifact/Sting/sting.arc
+++ b/weapon/artifact/Sting/sting.arc
@@ -12,7 +12,8 @@ sting.114
 sting.113
 sting.112
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 material 2
 dam 5
 magic 3
diff --git a/weapon/artifact/UW_Sword/uw_sword.arc b/weapon/artifact/UW_Sword/uw_sword.arc
index 99c6ae696..21fefeb10 100644
--- a/weapon/artifact/UW_Sword/uw_sword.arc
+++ b/weapon/artifact/UW_Sword/uw_sword.arc
@@ -19,7 +19,8 @@ weight 30000
 attacktype 65
 weapontype 1
 value 175000
-speed 0.1
+anim_speed 10
+client_anim_random 1
 anim
 uw_sword.111
 uw_sword.112
diff --git a/weapon/artifact/Usword/uk_sd.arc b/weapon/artifact/Usword/uk_sd.arc
index db83f062c..40a59237e 100644
--- a/weapon/artifact/Usword/uk_sd.arc
+++ b/weapon/artifact/Usword/uk_sd.arc
@@ -13,7 +13,8 @@ uk_sd.115
 uk_sd.116
 uk_sd.117
 mina
-speed .4
+anim_speed 2
+client_anim_random 1
 material 2
 Str 2
 Dex 2
diff --git a/weapon/artifact/firebrand.arc b/weapon/artifact/firebrand.arc
index ff5eea10f..fbc5b04ec 100644
--- a/weapon/artifact/firebrand.arc
+++ b/weapon/artifact/firebrand.arc
@@ -9,7 +9,8 @@ firebrand.111
 firebrand.112
 firebrand.113
 mina
-speed 0.25
+anim_speed 4
+client_anim_random 1
 material 2
 dam 9
 weight 22000
diff --git a/weapon/artifact/magi_staff.arc b/weapon/artifact/magi_staff.arc
index f39a16087..79d43a2e2 100644
--- a/weapon/artifact/magi_staff.arc
+++ b/weapon/artifact/magi_staff.arc
@@ -9,7 +9,8 @@ magi_staff.112
 magi_staff.113
 magi_staff.112
 mina
-speed .2
+anim_speed 5
+client_anim_random 1
 material 16
 weapontype 8
 resist_magic 30
diff --git a/weapon/artifact/skullcleav.arc b/weapon/artifact/skullcleav.arc
index 80881d606..2f0891bba 100644
--- a/weapon/artifact/skullcleav.arc
+++ b/weapon/artifact/skullcleav.arc
@@ -9,7 +9,8 @@ skullcleav.112
 skullcleav.113
 skullcleav.114
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 last_sp 11
 type 15
 weight 32000
diff --git a/weapon/bow/magic_bow.arc b/weapon/bow/magic_bow.arc
index fc8b9d3a6..479163e23 100644
--- a/weapon/bow/magic_bow.arc
+++ b/weapon/bow/magic_bow.arc
@@ -9,7 +9,8 @@ magic_bow.112
 magic_bow.113
 magic_bow.114
 mina
-speed 0.1
+anim_speed 10
+client_anim_random 1
 material 16
 face magic_bow.111
 magic 7
diff --git a/weapon/misc/shovel_1.arc b/weapon/misc/shovel_1.arc
index cab89b55f..9e13a0b33 100644
--- a/weapon/misc/shovel_1.arc
+++ b/weapon/misc/shovel_1.arc
@@ -22,4 +22,6 @@ name_pl shovels
 client_type 145
 body_arm -2
 skill two handed weapons
+anim_speed 5
+client_anim_random 1
 end