From 40ac891a06409fb14e7a9202f1411e627a88257b Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Tue, 9 Jun 2009 06:31:41 +0000
Subject: [PATCH] Ship files rename (partial commit cauz SF SVN blows)

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3135 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 .../{chmmr.big.0.png => avatar-big.0.png}     | Bin
 .../{chmmr.big.1.png => avatar-big.1.png}     | Bin
 .../{chmmr.big.10.png => avatar-big.10.png}   | Bin
 .../{chmmr.big.11.png => avatar-big.11.png}   | Bin
 .../{chmmr.big.12.png => avatar-big.12.png}   | Bin
 .../{chmmr.big.13.png => avatar-big.13.png}   | Bin
 .../{chmmr.big.14.png => avatar-big.14.png}   | Bin
 .../{chmmr.big.15.png => avatar-big.15.png}   | Bin
 .../{chmmr.big.2.png => avatar-big.2.png}     | Bin
 .../{chmmr.big.3.png => avatar-big.3.png}     | Bin
 .../{chmmr.big.4.png => avatar-big.4.png}     | Bin
 .../{chmmr.big.5.png => avatar-big.5.png}     | Bin
 .../{chmmr.big.6.png => avatar-big.6.png}     | Bin
 .../{chmmr.big.7.png => avatar-big.7.png}     | Bin
 .../{chmmr.big.8.png => avatar-big.8.png}     | Bin
 .../{chmmr.big.9.png => avatar-big.9.png}     | Bin
 sc2/content/base/ships/chmmr/avatar-big.ani   |  16 +++++++
 .../chmmr/{chmcap.0.png => avatar-cap.0.png}  | Bin
 .../chmmr/{chmcap.1.png => avatar-cap.1.png}  | Bin
 .../{chmcap.10.png => avatar-cap.10.png}      | Bin
 .../{chmcap.11.png => avatar-cap.11.png}      | Bin
 .../{chmcap.12.png => avatar-cap.12.png}      | Bin
 .../{chmcap.13.png => avatar-cap.13.png}      | Bin
 .../{chmcap.14.png => avatar-cap.14.png}      | Bin
 .../chmmr/{chmcap.2.png => avatar-cap.2.png}  | Bin
 .../chmmr/{chmcap.3.png => avatar-cap.3.png}  | Bin
 .../chmmr/{chmcap.4.png => avatar-cap.4.png}  | Bin
 .../chmmr/{chmcap.5.png => avatar-cap.5.png}  | Bin
 .../chmmr/{chmcap.6.png => avatar-cap.6.png}  | Bin
 .../chmmr/{chmcap.7.png => avatar-cap.7.png}  | Bin
 .../chmmr/{chmcap.8.png => avatar-cap.8.png}  | Bin
 .../chmmr/{chmcap.9.png => avatar-cap.9.png}  | Bin
 sc2/content/base/ships/chmmr/avatar-cap.ani   |  15 +++++++
 .../{chmicons.0.png => avatar-icons.0.png}    | Bin
 .../{chmicons.1.png => avatar-icons.1.png}    | Bin
 sc2/content/base/ships/chmmr/avatar-icons.ani |   2 +
 .../{chmmr.med.0.png => avatar-med.0.png}     | Bin
 .../{chmmr.med.1.png => avatar-med.1.png}     | Bin
 .../{chmmr.med.10.png => avatar-med.10.png}   | Bin
 .../{chmmr.med.11.png => avatar-med.11.png}   | Bin
 .../{chmmr.med.12.png => avatar-med.12.png}   | Bin
 .../{chmmr.med.13.png => avatar-med.13.png}   | Bin
 .../{chmmr.med.14.png => avatar-med.14.png}   | Bin
 .../{chmmr.med.15.png => avatar-med.15.png}   | Bin
 .../{chmmr.med.2.png => avatar-med.2.png}     | Bin
 .../{chmmr.med.3.png => avatar-med.3.png}     | Bin
 .../{chmmr.med.4.png => avatar-med.4.png}     | Bin
 .../{chmmr.med.5.png => avatar-med.5.png}     | Bin
 .../{chmmr.med.6.png => avatar-med.6.png}     | Bin
 .../{chmmr.med.7.png => avatar-med.7.png}     | Bin
 .../{chmmr.med.8.png => avatar-med.8.png}     | Bin
 .../{chmmr.med.9.png => avatar-med.9.png}     | Bin
 sc2/content/base/ships/chmmr/avatar-med.ani   |  16 +++++++
 ...chmmicon.0.png => avatar-meleeicons.0.png} | Bin
 ...chmmicon.1.png => avatar-meleeicons.1.png} | Bin
 .../base/ships/chmmr/avatar-meleeicons.ani    |   2 +
 .../{chmmr.sml.0.png => avatar-sml.0.png}     | Bin
 .../{chmmr.sml.1.png => avatar-sml.1.png}     | Bin
 .../{chmmr.sml.10.png => avatar-sml.10.png}   | Bin
 .../{chmmr.sml.11.png => avatar-sml.11.png}   | Bin
 .../{chmmr.sml.12.png => avatar-sml.12.png}   | Bin
 .../{chmmr.sml.13.png => avatar-sml.13.png}   | Bin
 .../{chmmr.sml.14.png => avatar-sml.14.png}   | Bin
 .../{chmmr.sml.15.png => avatar-sml.15.png}   | Bin
 .../{chmmr.sml.2.png => avatar-sml.2.png}     | Bin
 .../{chmmr.sml.3.png => avatar-sml.3.png}     | Bin
 .../{chmmr.sml.4.png => avatar-sml.4.png}     | Bin
 .../{chmmr.sml.5.png => avatar-sml.5.png}     | Bin
 .../{chmmr.sml.6.png => avatar-sml.6.png}     | Bin
 .../{chmmr.sml.7.png => avatar-sml.7.png}     | Bin
 .../{chmmr.sml.8.png => avatar-sml.8.png}     | Bin
 .../{chmmr.sml.9.png => avatar-sml.9.png}     | Bin
 sc2/content/base/ships/chmmr/avatar-sml.ani   |  16 +++++++
 .../ships/chmmr/{chmditty.mod => avatar.mod}  | Bin
 .../ships/chmmr/{chmsound.snd => avatar.snd}  |   0
 .../ships/chmmr/{chmtext.txt => avatar.txt}   |   0
 sc2/content/base/ships/chmmr/chmcap.ani       |  15 -------
 sc2/content/base/ships/chmmr/chmicons.ani     |   2 -
 sc2/content/base/ships/chmmr/chmmicon.ani     |   2 -
 sc2/content/base/ships/chmmr/chmmr.big        |  16 -------
 sc2/content/base/ships/chmmr/chmmr.med        |  16 -------
 sc2/content/base/ships/chmmr/chmmr.sml        |  16 -------
 sc2/content/base/ships/chmmr/muzbig.ani       |  41 ------------------
 sc2/content/base/ships/chmmr/muzmed.ani       |  41 ------------------
 sc2/content/base/ships/chmmr/muzsml.ani       |  41 ------------------
 .../chmmr/{muzbig.0.png => muzzle-big.0.png}  | Bin
 .../chmmr/{muzbig.1.png => muzzle-big.1.png}  | Bin
 .../{muzbig.10.png => muzzle-big.10.png}      | Bin
 .../{muzbig.11.png => muzzle-big.11.png}      | Bin
 .../{muzbig.12.png => muzzle-big.12.png}      | Bin
 .../{muzbig.13.png => muzzle-big.13.png}      | Bin
 .../{muzbig.14.png => muzzle-big.14.png}      | Bin
 .../{muzbig.15.png => muzzle-big.15.png}      | Bin
 .../{muzbig.16.png => muzzle-big.16.png}      | Bin
 .../{muzbig.17.png => muzzle-big.17.png}      | Bin
 .../{muzbig.18.png => muzzle-big.18.png}      | Bin
 .../{muzbig.19.png => muzzle-big.19.png}      | Bin
 .../chmmr/{muzbig.2.png => muzzle-big.2.png}  | Bin
 .../{muzbig.20.png => muzzle-big.20.png}      | Bin
 .../{muzbig.21.png => muzzle-big.21.png}      | Bin
 .../{muzbig.22.png => muzzle-big.22.png}      | Bin
 .../{muzbig.23.png => muzzle-big.23.png}      | Bin
 .../{muzbig.24.png => muzzle-big.24.png}      | Bin
 .../{muzbig.25.png => muzzle-big.25.png}      | Bin
 .../{muzbig.26.png => muzzle-big.26.png}      | Bin
 .../{muzbig.27.png => muzzle-big.27.png}      | Bin
 .../{muzbig.28.png => muzzle-big.28.png}      | Bin
 .../{muzbig.29.png => muzzle-big.29.png}      | Bin
 .../chmmr/{muzbig.3.png => muzzle-big.3.png}  | Bin
 .../{muzbig.30.png => muzzle-big.30.png}      | Bin
 .../{muzbig.31.png => muzzle-big.31.png}      | Bin
 .../{muzbig.32.png => muzzle-big.32.png}      | Bin
 .../{muzbig.33.png => muzzle-big.33.png}      | Bin
 .../{muzbig.34.png => muzzle-big.34.png}      | Bin
 .../{muzbig.35.png => muzzle-big.35.png}      | Bin
 .../{muzbig.36.png => muzzle-big.36.png}      | Bin
 .../{muzbig.37.png => muzzle-big.37.png}      | Bin
 .../{muzbig.38.png => muzzle-big.38.png}      | Bin
 .../{muzbig.39.png => muzzle-big.39.png}      | Bin
 .../chmmr/{muzbig.4.png => muzzle-big.4.png}  | Bin
 .../{muzbig.40.png => muzzle-big.40.png}      | Bin
 .../chmmr/{muzbig.5.png => muzzle-big.5.png}  | Bin
 .../chmmr/{muzbig.6.png => muzzle-big.6.png}  | Bin
 .../chmmr/{muzbig.7.png => muzzle-big.7.png}  | Bin
 .../chmmr/{muzbig.8.png => muzzle-big.8.png}  | Bin
 .../chmmr/{muzbig.9.png => muzzle-big.9.png}  | Bin
 sc2/content/base/ships/chmmr/muzzle-big.ani   |  41 ++++++++++++++++++
 .../chmmr/{muzmed.0.png => muzzle-med.0.png}  | Bin
 .../chmmr/{muzmed.1.png => muzzle-med.1.png}  | Bin
 .../{muzmed.10.png => muzzle-med.10.png}      | Bin
 .../{muzmed.11.png => muzzle-med.11.png}      | Bin
 .../{muzmed.12.png => muzzle-med.12.png}      | Bin
 .../{muzmed.13.png => muzzle-med.13.png}      | Bin
 .../{muzmed.14.png => muzzle-med.14.png}      | Bin
 .../{muzmed.15.png => muzzle-med.15.png}      | Bin
 .../{muzmed.16.png => muzzle-med.16.png}      | Bin
 .../{muzmed.17.png => muzzle-med.17.png}      | Bin
 .../{muzmed.18.png => muzzle-med.18.png}      | Bin
 .../{muzmed.19.png => muzzle-med.19.png}      | Bin
 .../chmmr/{muzmed.2.png => muzzle-med.2.png}  | Bin
 .../{muzmed.20.png => muzzle-med.20.png}      | Bin
 .../{muzmed.21.png => muzzle-med.21.png}      | Bin
 .../{muzmed.22.png => muzzle-med.22.png}      | Bin
 .../{muzmed.23.png => muzzle-med.23.png}      | Bin
 .../{muzmed.24.png => muzzle-med.24.png}      | Bin
 .../{muzmed.25.png => muzzle-med.25.png}      | Bin
 .../{muzmed.26.png => muzzle-med.26.png}      | Bin
 .../{muzmed.27.png => muzzle-med.27.png}      | Bin
 .../{muzmed.28.png => muzzle-med.28.png}      | Bin
 .../{muzmed.29.png => muzzle-med.29.png}      | Bin
 .../chmmr/{muzmed.3.png => muzzle-med.3.png}  | Bin
 .../{muzmed.30.png => muzzle-med.30.png}      | Bin
 .../{muzmed.31.png => muzzle-med.31.png}      | Bin
 .../{muzmed.32.png => muzzle-med.32.png}      | Bin
 .../{muzmed.33.png => muzzle-med.33.png}      | Bin
 .../{muzmed.34.png => muzzle-med.34.png}      | Bin
 .../{muzmed.35.png => muzzle-med.35.png}      | Bin
 .../{muzmed.36.png => muzzle-med.36.png}      | Bin
 .../{muzmed.37.png => muzzle-med.37.png}      | Bin
 .../{muzmed.38.png => muzzle-med.38.png}      | Bin
 .../{muzmed.39.png => muzzle-med.39.png}      | Bin
 .../chmmr/{muzmed.4.png => muzzle-med.4.png}  | Bin
 .../{muzmed.40.png => muzzle-med.40.png}      | Bin
 .../chmmr/{muzmed.5.png => muzzle-med.5.png}  | Bin
 .../chmmr/{muzmed.6.png => muzzle-med.6.png}  | Bin
 .../chmmr/{muzmed.7.png => muzzle-med.7.png}  | Bin
 .../chmmr/{muzmed.8.png => muzzle-med.8.png}  | Bin
 .../chmmr/{muzmed.9.png => muzzle-med.9.png}  | Bin
 sc2/content/base/ships/chmmr/muzzle-med.ani   |  41 ++++++++++++++++++
 .../chmmr/{muzsml.0.png => muzzle-sml.0.png}  | Bin
 .../chmmr/{muzsml.1.png => muzzle-sml.1.png}  | Bin
 .../{muzsml.10.png => muzzle-sml.10.png}      | Bin
 .../{muzsml.11.png => muzzle-sml.11.png}      | Bin
 .../{muzsml.12.png => muzzle-sml.12.png}      | Bin
 .../{muzsml.13.png => muzzle-sml.13.png}      | Bin
 .../{muzsml.14.png => muzzle-sml.14.png}      | Bin
 .../{muzsml.15.png => muzzle-sml.15.png}      | Bin
 .../{muzsml.16.png => muzzle-sml.16.png}      | Bin
 .../{muzsml.17.png => muzzle-sml.17.png}      | Bin
 .../{muzsml.18.png => muzzle-sml.18.png}      | Bin
 .../{muzsml.19.png => muzzle-sml.19.png}      | Bin
 .../chmmr/{muzsml.2.png => muzzle-sml.2.png}  | Bin
 .../{muzsml.20.png => muzzle-sml.20.png}      | Bin
 .../{muzsml.21.png => muzzle-sml.21.png}      | Bin
 .../{muzsml.22.png => muzzle-sml.22.png}      | Bin
 .../{muzsml.23.png => muzzle-sml.23.png}      | Bin
 .../{muzsml.24.png => muzzle-sml.24.png}      | Bin
 .../{muzsml.25.png => muzzle-sml.25.png}      | Bin
 .../{muzsml.26.png => muzzle-sml.26.png}      | Bin
 .../{muzsml.27.png => muzzle-sml.27.png}      | Bin
 .../{muzsml.28.png => muzzle-sml.28.png}      | Bin
 .../{muzsml.29.png => muzzle-sml.29.png}      | Bin
 .../chmmr/{muzsml.3.png => muzzle-sml.3.png}  | Bin
 .../{muzsml.30.png => muzzle-sml.30.png}      | Bin
 .../{muzsml.31.png => muzzle-sml.31.png}      | Bin
 .../{muzsml.32.png => muzzle-sml.32.png}      | Bin
 .../{muzsml.33.png => muzzle-sml.33.png}      | Bin
 .../{muzsml.34.png => muzzle-sml.34.png}      | Bin
 .../{muzsml.35.png => muzzle-sml.35.png}      | Bin
 .../{muzsml.36.png => muzzle-sml.36.png}      | Bin
 .../{muzsml.37.png => muzzle-sml.37.png}      | Bin
 .../{muzsml.38.png => muzzle-sml.38.png}      | Bin
 .../{muzsml.39.png => muzzle-sml.39.png}      | Bin
 .../chmmr/{muzsml.4.png => muzzle-sml.4.png}  | Bin
 .../{muzsml.40.png => muzzle-sml.40.png}      | Bin
 .../chmmr/{muzsml.5.png => muzzle-sml.5.png}  | Bin
 .../chmmr/{muzsml.6.png => muzzle-sml.6.png}  | Bin
 .../chmmr/{muzsml.7.png => muzzle-sml.7.png}  | Bin
 .../chmmr/{muzsml.8.png => muzzle-sml.8.png}  | Bin
 .../chmmr/{muzsml.9.png => muzzle-sml.9.png}  | Bin
 sc2/content/base/ships/chmmr/muzzle-sml.ani   |  41 ++++++++++++++++++
 sc2/content/base/ships/chmmr/satbig.ani       |   8 ----
 .../{satbig.0.png => satellite-big.0.png}     | Bin
 .../{satbig.1.png => satellite-big.1.png}     | Bin
 .../{satbig.2.png => satellite-big.2.png}     | Bin
 .../{satbig.3.png => satellite-big.3.png}     | Bin
 .../{satbig.4.png => satellite-big.4.png}     | Bin
 .../{satbig.5.png => satellite-big.5.png}     | Bin
 .../{satbig.6.png => satellite-big.6.png}     | Bin
 .../{satbig.7.png => satellite-big.7.png}     | Bin
 .../base/ships/chmmr/satellite-big.ani        |   8 ++++
 .../{satmed.0.png => satellite-med.0.png}     | Bin
 .../{satmed.1.png => satellite-med.1.png}     | Bin
 .../{satmed.2.png => satellite-med.2.png}     | Bin
 .../{satmed.3.png => satellite-med.3.png}     | Bin
 .../{satmed.4.png => satellite-med.4.png}     | Bin
 .../{satmed.5.png => satellite-med.5.png}     | Bin
 .../{satmed.6.png => satellite-med.6.png}     | Bin
 .../{satmed.7.png => satellite-med.7.png}     | Bin
 .../base/ships/chmmr/satellite-med.ani        |   8 ++++
 .../{satsml.0.png => satellite-sml.0.png}     | Bin
 .../{satsml.1.png => satellite-sml.1.png}     | Bin
 .../{satsml.2.png => satellite-sml.2.png}     | Bin
 .../{satsml.3.png => satellite-sml.3.png}     | Bin
 .../{satsml.4.png => satellite-sml.4.png}     | Bin
 .../{satsml.5.png => satellite-sml.5.png}     | Bin
 .../{satsml.6.png => satellite-sml.6.png}     | Bin
 .../{satsml.7.png => satellite-sml.7.png}     | Bin
 .../base/ships/chmmr/satellite-sml.ani        |   8 ++++
 sc2/content/base/ships/chmmr/satmed.ani       |   8 ----
 sc2/content/base/ships/chmmr/satsml.ani       |   8 ----
 ...{promicon.0.png => drone-meleeicons.0.png} | Bin
 .../base/ships/drone/drone-meleeicons.ani     |   1 +
 sc2/content/base/ships/drone/promicon.ani     |   1 -
 sc2/content/base/ships/druuge/canbig.ani      |  24 ----------
 sc2/content/base/ships/druuge/canmed.ani      |  24 ----------
 .../druuge/{canbig.0.png => cannon-big.0.png} | Bin
 .../druuge/{canbig.1.png => cannon-big.1.png} | Bin
 .../{canbig.10.png => cannon-big.10.png}      | Bin
 .../{canbig.11.png => cannon-big.11.png}      | Bin
 .../{canbig.12.png => cannon-big.12.png}      | Bin
 .../{canbig.13.png => cannon-big.13.png}      | Bin
 .../{canbig.14.png => cannon-big.14.png}      | Bin
 .../{canbig.15.png => cannon-big.15.png}      | Bin
 .../{canbig.16.png => cannon-big.16.png}      | Bin
 .../{canbig.17.png => cannon-big.17.png}      | Bin
 .../{canbig.18.png => cannon-big.18.png}      | Bin
 .../{canbig.19.png => cannon-big.19.png}      | Bin
 .../druuge/{canbig.2.png => cannon-big.2.png} | Bin
 .../{canbig.20.png => cannon-big.20.png}      | Bin
 .../{canbig.21.png => cannon-big.21.png}      | Bin
 .../{canbig.22.png => cannon-big.22.png}      | Bin
 .../{canbig.23.png => cannon-big.23.png}      | Bin
 .../druuge/{canbig.3.png => cannon-big.3.png} | Bin
 .../druuge/{canbig.4.png => cannon-big.4.png} | Bin
 .../druuge/{canbig.5.png => cannon-big.5.png} | Bin
 .../druuge/{canbig.6.png => cannon-big.6.png} | Bin
 .../druuge/{canbig.7.png => cannon-big.7.png} | Bin
 .../druuge/{canbig.8.png => cannon-big.8.png} | Bin
 .../druuge/{canbig.9.png => cannon-big.9.png} | Bin
 sc2/content/base/ships/druuge/cannon-big.ani  |  24 ++++++++++
 .../druuge/{canmed.0.png => cannon-med.0.png} | Bin
 .../druuge/{canmed.1.png => cannon-med.1.png} | Bin
 .../{canmed.10.png => cannon-med.10.png}      | Bin
 .../{canmed.11.png => cannon-med.11.png}      | Bin
 .../{canmed.12.png => cannon-med.12.png}      | Bin
 .../{canmed.13.png => cannon-med.13.png}      | Bin
 .../{canmed.14.png => cannon-med.14.png}      | Bin
 .../{canmed.15.png => cannon-med.15.png}      | Bin
 .../{canmed.16.png => cannon-med.16.png}      | Bin
 .../{canmed.17.png => cannon-med.17.png}      | Bin
 .../{canmed.18.png => cannon-med.18.png}      | Bin
 .../{canmed.19.png => cannon-med.19.png}      | Bin
 .../druuge/{canmed.2.png => cannon-med.2.png} | Bin
 .../{canmed.20.png => cannon-med.20.png}      | Bin
 .../{canmed.21.png => cannon-med.21.png}      | Bin
 .../{canmed.22.png => cannon-med.22.png}      | Bin
 .../{canmed.23.png => cannon-med.23.png}      | Bin
 .../druuge/{canmed.3.png => cannon-med.3.png} | Bin
 .../druuge/{canmed.4.png => cannon-med.4.png} | Bin
 .../druuge/{canmed.5.png => cannon-med.5.png} | Bin
 .../druuge/{canmed.6.png => cannon-med.6.png} | Bin
 .../druuge/{canmed.7.png => cannon-med.7.png} | Bin
 .../druuge/{canmed.8.png => cannon-med.8.png} | Bin
 .../druuge/{canmed.9.png => cannon-med.9.png} | Bin
 sc2/content/base/ships/druuge/cannon-med.ani  |  24 ++++++++++
 .../druuge/{cansml.0.png => cannon-sml.0.png} | Bin
 .../druuge/{cansml.1.png => cannon-sml.1.png} | Bin
 .../{cansml.10.png => cannon-sml.10.png}      | Bin
 .../{cansml.11.png => cannon-sml.11.png}      | Bin
 .../{cansml.12.png => cannon-sml.12.png}      | Bin
 .../{cansml.13.png => cannon-sml.13.png}      | Bin
 .../{cansml.14.png => cannon-sml.14.png}      | Bin
 .../{cansml.15.png => cannon-sml.15.png}      | Bin
 .../{cansml.16.png => cannon-sml.16.png}      | Bin
 .../{cansml.17.png => cannon-sml.17.png}      | Bin
 .../{cansml.18.png => cannon-sml.18.png}      | Bin
 .../{cansml.19.png => cannon-sml.19.png}      | Bin
 .../druuge/{cansml.2.png => cannon-sml.2.png} | Bin
 .../{cansml.20.png => cannon-sml.20.png}      | Bin
 .../{cansml.21.png => cannon-sml.21.png}      | Bin
 .../{cansml.22.png => cannon-sml.22.png}      | Bin
 .../{cansml.23.png => cannon-sml.23.png}      | Bin
 .../druuge/{cansml.3.png => cannon-sml.3.png} | Bin
 .../druuge/{cansml.4.png => cannon-sml.4.png} | Bin
 .../druuge/{cansml.5.png => cannon-sml.5.png} | Bin
 .../druuge/{cansml.6.png => cannon-sml.6.png} | Bin
 .../druuge/{cansml.7.png => cannon-sml.7.png} | Bin
 .../druuge/{cansml.8.png => cannon-sml.8.png} | Bin
 .../druuge/{cansml.9.png => cannon-sml.9.png} | Bin
 sc2/content/base/ships/druuge/cannon-sml.ani  |  24 ++++++++++
 sc2/content/base/ships/druuge/cansml.ani      |  24 ----------
 sc2/content/base/ships/druuge/drucap.ani      |  15 -------
 sc2/content/base/ships/druuge/druicons.ani    |   2 -
 sc2/content/base/ships/druuge/drumicon.ani    |   2 -
 sc2/content/base/ships/druuge/druuge.big      |  16 -------
 sc2/content/base/ships/druuge/druuge.med      |  16 -------
 sc2/content/base/ships/druuge/druuge.sml      |  16 -------
 .../{druuge.big.0.png => mauler-big.0.png}    | Bin
 .../{druuge.big.1.png => mauler-big.1.png}    | Bin
 .../{druuge.big.10.png => mauler-big.10.png}  | Bin
 .../{druuge.big.11.png => mauler-big.11.png}  | Bin
 .../{druuge.big.12.png => mauler-big.12.png}  | Bin
 .../{druuge.big.13.png => mauler-big.13.png}  | Bin
 .../{druuge.big.14.png => mauler-big.14.png}  | Bin
 .../{druuge.big.15.png => mauler-big.15.png}  | Bin
 .../{drumicon.0.png => mauler-big.2.png}      | Bin
 .../{druuge.big.3.png => mauler-big.3.png}    | Bin
 .../{druuge.big.4.png => mauler-big.4.png}    | Bin
 .../{druuge.big.5.png => mauler-big.5.png}    | Bin
 .../{druuge.big.6.png => mauler-big.6.png}    | Bin
 .../{druuge.big.7.png => mauler-big.7.png}    | Bin
 .../{druuge.big.8.png => mauler-big.8.png}    | Bin
 .../{druuge.big.9.png => mauler-big.9.png}    | Bin
 sc2/content/base/ships/druuge/mauler-big.ani  |  16 +++++++
 .../druuge/{drucap.0.png => mauler-cap.0.png} | Bin
 .../druuge/{drucap.1.png => mauler-cap.1.png} | Bin
 .../{drucap.10.png => mauler-cap.10.png}      | Bin
 .../{drucap.11.png => mauler-cap.11.png}      | Bin
 .../{drucap.12.png => mauler-cap.12.png}      | Bin
 .../{drucap.13.png => mauler-cap.13.png}      | Bin
 .../{drucap.14.png => mauler-cap.14.png}      | Bin
 .../druuge/{drucap.2.png => mauler-cap.2.png} | Bin
 .../druuge/{drucap.3.png => mauler-cap.3.png} | Bin
 .../druuge/{drucap.4.png => mauler-cap.4.png} | Bin
 .../druuge/{drucap.5.png => mauler-cap.5.png} | Bin
 .../druuge/{drucap.6.png => mauler-cap.6.png} | Bin
 .../druuge/{drucap.7.png => mauler-cap.7.png} | Bin
 .../druuge/{drucap.8.png => mauler-cap.8.png} | Bin
 .../druuge/{drucap.9.png => mauler-cap.9.png} | Bin
 sc2/content/base/ships/druuge/mauler-cap.ani  |  15 +++++++
 .../{druicons.0.png => mauler-icons.0.png}    | Bin
 .../{druicons.1.png => mauler-icons.1.png}    | Bin
 .../base/ships/druuge/mauler-icons.ani        |   2 +
 .../{druuge.med.0.png => mauler-med.0.png}    | Bin
 .../{druuge.med.1.png => mauler-med.1.png}    | Bin
 .../{druuge.med.10.png => mauler-med.10.png}  | Bin
 .../{druuge.med.11.png => mauler-med.11.png}  | Bin
 .../{druuge.med.12.png => mauler-med.12.png}  | Bin
 .../{druuge.med.13.png => mauler-med.13.png}  | Bin
 .../{druuge.med.14.png => mauler-med.14.png}  | Bin
 .../{druuge.med.15.png => mauler-med.15.png}  | Bin
 .../{druuge.med.2.png => mauler-med.2.png}    | Bin
 .../{druuge.med.3.png => mauler-med.3.png}    | Bin
 .../{druuge.med.4.png => mauler-med.4.png}    | Bin
 .../{druuge.med.5.png => mauler-med.5.png}    | Bin
 .../{druuge.med.6.png => mauler-med.6.png}    | Bin
 .../{druuge.med.7.png => mauler-med.7.png}    | Bin
 .../{druuge.med.8.png => mauler-med.8.png}    | Bin
 .../{druuge.med.9.png => mauler-med.9.png}    | Bin
 sc2/content/base/ships/druuge/mauler-med.ani  |  16 +++++++
 ...uuge.big.2.png => mauler-meleeicons.0.png} | Bin
 ...drumicon.1.png => mauler-meleeicons.1.png} | Bin
 .../base/ships/druuge/mauler-meleeicons.ani   |   2 +
 .../{druuge.sml.0.png => mauler-sml.0.png}    | Bin
 .../{druuge.sml.1.png => mauler-sml.1.png}    | Bin
 .../{druuge.sml.10.png => mauler-sml.10.png}  | Bin
 .../{druuge.sml.11.png => mauler-sml.11.png}  | Bin
 .../{druuge.sml.12.png => mauler-sml.12.png}  | Bin
 .../{druuge.sml.13.png => mauler-sml.13.png}  | Bin
 .../{druuge.sml.14.png => mauler-sml.14.png}  | Bin
 .../{druuge.sml.15.png => mauler-sml.15.png}  | Bin
 .../{druuge.sml.2.png => mauler-sml.2.png}    | Bin
 .../{druuge.sml.3.png => mauler-sml.3.png}    | Bin
 .../{druuge.sml.4.png => mauler-sml.4.png}    | Bin
 .../{druuge.sml.5.png => mauler-sml.5.png}    | Bin
 .../{druuge.sml.6.png => mauler-sml.6.png}    | Bin
 .../{druuge.sml.7.png => mauler-sml.7.png}    | Bin
 .../{druuge.sml.8.png => mauler-sml.8.png}    | Bin
 .../{druuge.sml.9.png => mauler-sml.9.png}    | Bin
 sc2/content/base/ships/druuge/mauler-sml.ani  |  16 +++++++
 .../ships/druuge/{druditty.mod => mauler.mod} | Bin
 .../ships/druuge/{drusound.snd => mauler.snd} |   0
 .../ships/druuge/{drutext.txt => mauler.txt}  |   0
 404 files changed, 354 insertions(+), 354 deletions(-)
 rename sc2/content/base/ships/chmmr/{chmmr.big.0.png => avatar-big.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.1.png => avatar-big.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.10.png => avatar-big.10.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.11.png => avatar-big.11.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.12.png => avatar-big.12.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.13.png => avatar-big.13.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.14.png => avatar-big.14.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.15.png => avatar-big.15.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.2.png => avatar-big.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.3.png => avatar-big.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.4.png => avatar-big.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.5.png => avatar-big.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.6.png => avatar-big.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.7.png => avatar-big.7.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.8.png => avatar-big.8.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.big.9.png => avatar-big.9.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/avatar-big.ani
 rename sc2/content/base/ships/chmmr/{chmcap.0.png => avatar-cap.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.1.png => avatar-cap.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.10.png => avatar-cap.10.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.11.png => avatar-cap.11.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.12.png => avatar-cap.12.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.13.png => avatar-cap.13.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.14.png => avatar-cap.14.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.2.png => avatar-cap.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.3.png => avatar-cap.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.4.png => avatar-cap.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.5.png => avatar-cap.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.6.png => avatar-cap.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.7.png => avatar-cap.7.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.8.png => avatar-cap.8.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmcap.9.png => avatar-cap.9.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/avatar-cap.ani
 rename sc2/content/base/ships/chmmr/{chmicons.0.png => avatar-icons.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmicons.1.png => avatar-icons.1.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/avatar-icons.ani
 rename sc2/content/base/ships/chmmr/{chmmr.med.0.png => avatar-med.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.1.png => avatar-med.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.10.png => avatar-med.10.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.11.png => avatar-med.11.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.12.png => avatar-med.12.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.13.png => avatar-med.13.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.14.png => avatar-med.14.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.15.png => avatar-med.15.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.2.png => avatar-med.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.3.png => avatar-med.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.4.png => avatar-med.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.5.png => avatar-med.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.6.png => avatar-med.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.7.png => avatar-med.7.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.8.png => avatar-med.8.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.med.9.png => avatar-med.9.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/avatar-med.ani
 rename sc2/content/base/ships/chmmr/{chmmicon.0.png => avatar-meleeicons.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmicon.1.png => avatar-meleeicons.1.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/avatar-meleeicons.ani
 rename sc2/content/base/ships/chmmr/{chmmr.sml.0.png => avatar-sml.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.1.png => avatar-sml.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.10.png => avatar-sml.10.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.11.png => avatar-sml.11.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.12.png => avatar-sml.12.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.13.png => avatar-sml.13.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.14.png => avatar-sml.14.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.15.png => avatar-sml.15.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.2.png => avatar-sml.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.3.png => avatar-sml.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.4.png => avatar-sml.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.5.png => avatar-sml.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.6.png => avatar-sml.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.7.png => avatar-sml.7.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.8.png => avatar-sml.8.png} (100%)
 rename sc2/content/base/ships/chmmr/{chmmr.sml.9.png => avatar-sml.9.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/avatar-sml.ani
 rename sc2/content/base/ships/chmmr/{chmditty.mod => avatar.mod} (100%)
 rename sc2/content/base/ships/chmmr/{chmsound.snd => avatar.snd} (100%)
 rename sc2/content/base/ships/chmmr/{chmtext.txt => avatar.txt} (100%)
 delete mode 100644 sc2/content/base/ships/chmmr/chmcap.ani
 delete mode 100644 sc2/content/base/ships/chmmr/chmicons.ani
 delete mode 100644 sc2/content/base/ships/chmmr/chmmicon.ani
 delete mode 100644 sc2/content/base/ships/chmmr/chmmr.big
 delete mode 100644 sc2/content/base/ships/chmmr/chmmr.med
 delete mode 100644 sc2/content/base/ships/chmmr/chmmr.sml
 delete mode 100644 sc2/content/base/ships/chmmr/muzbig.ani
 delete mode 100644 sc2/content/base/ships/chmmr/muzmed.ani
 delete mode 100644 sc2/content/base/ships/chmmr/muzsml.ani
 rename sc2/content/base/ships/chmmr/{muzbig.0.png => muzzle-big.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.1.png => muzzle-big.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.10.png => muzzle-big.10.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.11.png => muzzle-big.11.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.12.png => muzzle-big.12.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.13.png => muzzle-big.13.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.14.png => muzzle-big.14.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.15.png => muzzle-big.15.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.16.png => muzzle-big.16.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.17.png => muzzle-big.17.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.18.png => muzzle-big.18.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.19.png => muzzle-big.19.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.2.png => muzzle-big.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.20.png => muzzle-big.20.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.21.png => muzzle-big.21.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.22.png => muzzle-big.22.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.23.png => muzzle-big.23.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.24.png => muzzle-big.24.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.25.png => muzzle-big.25.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.26.png => muzzle-big.26.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.27.png => muzzle-big.27.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.28.png => muzzle-big.28.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.29.png => muzzle-big.29.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.3.png => muzzle-big.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.30.png => muzzle-big.30.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.31.png => muzzle-big.31.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.32.png => muzzle-big.32.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.33.png => muzzle-big.33.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.34.png => muzzle-big.34.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.35.png => muzzle-big.35.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.36.png => muzzle-big.36.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.37.png => muzzle-big.37.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.38.png => muzzle-big.38.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.39.png => muzzle-big.39.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.4.png => muzzle-big.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.40.png => muzzle-big.40.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.5.png => muzzle-big.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.6.png => muzzle-big.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.7.png => muzzle-big.7.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.8.png => muzzle-big.8.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzbig.9.png => muzzle-big.9.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/muzzle-big.ani
 rename sc2/content/base/ships/chmmr/{muzmed.0.png => muzzle-med.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.1.png => muzzle-med.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.10.png => muzzle-med.10.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.11.png => muzzle-med.11.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.12.png => muzzle-med.12.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.13.png => muzzle-med.13.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.14.png => muzzle-med.14.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.15.png => muzzle-med.15.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.16.png => muzzle-med.16.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.17.png => muzzle-med.17.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.18.png => muzzle-med.18.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.19.png => muzzle-med.19.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.2.png => muzzle-med.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.20.png => muzzle-med.20.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.21.png => muzzle-med.21.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.22.png => muzzle-med.22.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.23.png => muzzle-med.23.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.24.png => muzzle-med.24.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.25.png => muzzle-med.25.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.26.png => muzzle-med.26.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.27.png => muzzle-med.27.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.28.png => muzzle-med.28.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.29.png => muzzle-med.29.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.3.png => muzzle-med.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.30.png => muzzle-med.30.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.31.png => muzzle-med.31.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.32.png => muzzle-med.32.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.33.png => muzzle-med.33.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.34.png => muzzle-med.34.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.35.png => muzzle-med.35.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.36.png => muzzle-med.36.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.37.png => muzzle-med.37.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.38.png => muzzle-med.38.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.39.png => muzzle-med.39.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.4.png => muzzle-med.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.40.png => muzzle-med.40.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.5.png => muzzle-med.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.6.png => muzzle-med.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.7.png => muzzle-med.7.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.8.png => muzzle-med.8.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzmed.9.png => muzzle-med.9.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/muzzle-med.ani
 rename sc2/content/base/ships/chmmr/{muzsml.0.png => muzzle-sml.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.1.png => muzzle-sml.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.10.png => muzzle-sml.10.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.11.png => muzzle-sml.11.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.12.png => muzzle-sml.12.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.13.png => muzzle-sml.13.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.14.png => muzzle-sml.14.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.15.png => muzzle-sml.15.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.16.png => muzzle-sml.16.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.17.png => muzzle-sml.17.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.18.png => muzzle-sml.18.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.19.png => muzzle-sml.19.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.2.png => muzzle-sml.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.20.png => muzzle-sml.20.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.21.png => muzzle-sml.21.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.22.png => muzzle-sml.22.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.23.png => muzzle-sml.23.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.24.png => muzzle-sml.24.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.25.png => muzzle-sml.25.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.26.png => muzzle-sml.26.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.27.png => muzzle-sml.27.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.28.png => muzzle-sml.28.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.29.png => muzzle-sml.29.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.3.png => muzzle-sml.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.30.png => muzzle-sml.30.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.31.png => muzzle-sml.31.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.32.png => muzzle-sml.32.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.33.png => muzzle-sml.33.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.34.png => muzzle-sml.34.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.35.png => muzzle-sml.35.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.36.png => muzzle-sml.36.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.37.png => muzzle-sml.37.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.38.png => muzzle-sml.38.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.39.png => muzzle-sml.39.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.4.png => muzzle-sml.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.40.png => muzzle-sml.40.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.5.png => muzzle-sml.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.6.png => muzzle-sml.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.7.png => muzzle-sml.7.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.8.png => muzzle-sml.8.png} (100%)
 rename sc2/content/base/ships/chmmr/{muzsml.9.png => muzzle-sml.9.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/muzzle-sml.ani
 delete mode 100644 sc2/content/base/ships/chmmr/satbig.ani
 rename sc2/content/base/ships/chmmr/{satbig.0.png => satellite-big.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{satbig.1.png => satellite-big.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{satbig.2.png => satellite-big.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{satbig.3.png => satellite-big.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{satbig.4.png => satellite-big.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{satbig.5.png => satellite-big.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{satbig.6.png => satellite-big.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{satbig.7.png => satellite-big.7.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/satellite-big.ani
 rename sc2/content/base/ships/chmmr/{satmed.0.png => satellite-med.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{satmed.1.png => satellite-med.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{satmed.2.png => satellite-med.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{satmed.3.png => satellite-med.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{satmed.4.png => satellite-med.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{satmed.5.png => satellite-med.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{satmed.6.png => satellite-med.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{satmed.7.png => satellite-med.7.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/satellite-med.ani
 rename sc2/content/base/ships/chmmr/{satsml.0.png => satellite-sml.0.png} (100%)
 rename sc2/content/base/ships/chmmr/{satsml.1.png => satellite-sml.1.png} (100%)
 rename sc2/content/base/ships/chmmr/{satsml.2.png => satellite-sml.2.png} (100%)
 rename sc2/content/base/ships/chmmr/{satsml.3.png => satellite-sml.3.png} (100%)
 rename sc2/content/base/ships/chmmr/{satsml.4.png => satellite-sml.4.png} (100%)
 rename sc2/content/base/ships/chmmr/{satsml.5.png => satellite-sml.5.png} (100%)
 rename sc2/content/base/ships/chmmr/{satsml.6.png => satellite-sml.6.png} (100%)
 rename sc2/content/base/ships/chmmr/{satsml.7.png => satellite-sml.7.png} (100%)
 create mode 100644 sc2/content/base/ships/chmmr/satellite-sml.ani
 delete mode 100644 sc2/content/base/ships/chmmr/satmed.ani
 delete mode 100644 sc2/content/base/ships/chmmr/satsml.ani
 rename sc2/content/base/ships/drone/{promicon.0.png => drone-meleeicons.0.png} (100%)
 create mode 100644 sc2/content/base/ships/drone/drone-meleeicons.ani
 delete mode 100644 sc2/content/base/ships/drone/promicon.ani
 delete mode 100644 sc2/content/base/ships/druuge/canbig.ani
 delete mode 100644 sc2/content/base/ships/druuge/canmed.ani
 rename sc2/content/base/ships/druuge/{canbig.0.png => cannon-big.0.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.1.png => cannon-big.1.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.10.png => cannon-big.10.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.11.png => cannon-big.11.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.12.png => cannon-big.12.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.13.png => cannon-big.13.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.14.png => cannon-big.14.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.15.png => cannon-big.15.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.16.png => cannon-big.16.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.17.png => cannon-big.17.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.18.png => cannon-big.18.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.19.png => cannon-big.19.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.2.png => cannon-big.2.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.20.png => cannon-big.20.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.21.png => cannon-big.21.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.22.png => cannon-big.22.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.23.png => cannon-big.23.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.3.png => cannon-big.3.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.4.png => cannon-big.4.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.5.png => cannon-big.5.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.6.png => cannon-big.6.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.7.png => cannon-big.7.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.8.png => cannon-big.8.png} (100%)
 rename sc2/content/base/ships/druuge/{canbig.9.png => cannon-big.9.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/cannon-big.ani
 rename sc2/content/base/ships/druuge/{canmed.0.png => cannon-med.0.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.1.png => cannon-med.1.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.10.png => cannon-med.10.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.11.png => cannon-med.11.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.12.png => cannon-med.12.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.13.png => cannon-med.13.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.14.png => cannon-med.14.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.15.png => cannon-med.15.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.16.png => cannon-med.16.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.17.png => cannon-med.17.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.18.png => cannon-med.18.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.19.png => cannon-med.19.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.2.png => cannon-med.2.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.20.png => cannon-med.20.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.21.png => cannon-med.21.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.22.png => cannon-med.22.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.23.png => cannon-med.23.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.3.png => cannon-med.3.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.4.png => cannon-med.4.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.5.png => cannon-med.5.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.6.png => cannon-med.6.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.7.png => cannon-med.7.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.8.png => cannon-med.8.png} (100%)
 rename sc2/content/base/ships/druuge/{canmed.9.png => cannon-med.9.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/cannon-med.ani
 rename sc2/content/base/ships/druuge/{cansml.0.png => cannon-sml.0.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.1.png => cannon-sml.1.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.10.png => cannon-sml.10.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.11.png => cannon-sml.11.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.12.png => cannon-sml.12.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.13.png => cannon-sml.13.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.14.png => cannon-sml.14.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.15.png => cannon-sml.15.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.16.png => cannon-sml.16.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.17.png => cannon-sml.17.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.18.png => cannon-sml.18.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.19.png => cannon-sml.19.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.2.png => cannon-sml.2.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.20.png => cannon-sml.20.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.21.png => cannon-sml.21.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.22.png => cannon-sml.22.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.23.png => cannon-sml.23.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.3.png => cannon-sml.3.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.4.png => cannon-sml.4.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.5.png => cannon-sml.5.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.6.png => cannon-sml.6.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.7.png => cannon-sml.7.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.8.png => cannon-sml.8.png} (100%)
 rename sc2/content/base/ships/druuge/{cansml.9.png => cannon-sml.9.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/cannon-sml.ani
 delete mode 100644 sc2/content/base/ships/druuge/cansml.ani
 delete mode 100644 sc2/content/base/ships/druuge/drucap.ani
 delete mode 100644 sc2/content/base/ships/druuge/druicons.ani
 delete mode 100644 sc2/content/base/ships/druuge/drumicon.ani
 delete mode 100644 sc2/content/base/ships/druuge/druuge.big
 delete mode 100644 sc2/content/base/ships/druuge/druuge.med
 delete mode 100644 sc2/content/base/ships/druuge/druuge.sml
 rename sc2/content/base/ships/druuge/{druuge.big.0.png => mauler-big.0.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.1.png => mauler-big.1.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.10.png => mauler-big.10.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.11.png => mauler-big.11.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.12.png => mauler-big.12.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.13.png => mauler-big.13.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.14.png => mauler-big.14.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.15.png => mauler-big.15.png} (100%)
 rename sc2/content/base/ships/druuge/{drumicon.0.png => mauler-big.2.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.3.png => mauler-big.3.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.4.png => mauler-big.4.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.5.png => mauler-big.5.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.6.png => mauler-big.6.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.7.png => mauler-big.7.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.8.png => mauler-big.8.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.big.9.png => mauler-big.9.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/mauler-big.ani
 rename sc2/content/base/ships/druuge/{drucap.0.png => mauler-cap.0.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.1.png => mauler-cap.1.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.10.png => mauler-cap.10.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.11.png => mauler-cap.11.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.12.png => mauler-cap.12.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.13.png => mauler-cap.13.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.14.png => mauler-cap.14.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.2.png => mauler-cap.2.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.3.png => mauler-cap.3.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.4.png => mauler-cap.4.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.5.png => mauler-cap.5.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.6.png => mauler-cap.6.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.7.png => mauler-cap.7.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.8.png => mauler-cap.8.png} (100%)
 rename sc2/content/base/ships/druuge/{drucap.9.png => mauler-cap.9.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/mauler-cap.ani
 rename sc2/content/base/ships/druuge/{druicons.0.png => mauler-icons.0.png} (100%)
 rename sc2/content/base/ships/druuge/{druicons.1.png => mauler-icons.1.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/mauler-icons.ani
 rename sc2/content/base/ships/druuge/{druuge.med.0.png => mauler-med.0.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.1.png => mauler-med.1.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.10.png => mauler-med.10.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.11.png => mauler-med.11.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.12.png => mauler-med.12.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.13.png => mauler-med.13.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.14.png => mauler-med.14.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.15.png => mauler-med.15.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.2.png => mauler-med.2.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.3.png => mauler-med.3.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.4.png => mauler-med.4.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.5.png => mauler-med.5.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.6.png => mauler-med.6.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.7.png => mauler-med.7.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.8.png => mauler-med.8.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.med.9.png => mauler-med.9.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/mauler-med.ani
 rename sc2/content/base/ships/druuge/{druuge.big.2.png => mauler-meleeicons.0.png} (100%)
 rename sc2/content/base/ships/druuge/{drumicon.1.png => mauler-meleeicons.1.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/mauler-meleeicons.ani
 rename sc2/content/base/ships/druuge/{druuge.sml.0.png => mauler-sml.0.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.1.png => mauler-sml.1.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.10.png => mauler-sml.10.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.11.png => mauler-sml.11.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.12.png => mauler-sml.12.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.13.png => mauler-sml.13.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.14.png => mauler-sml.14.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.15.png => mauler-sml.15.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.2.png => mauler-sml.2.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.3.png => mauler-sml.3.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.4.png => mauler-sml.4.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.5.png => mauler-sml.5.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.6.png => mauler-sml.6.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.7.png => mauler-sml.7.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.8.png => mauler-sml.8.png} (100%)
 rename sc2/content/base/ships/druuge/{druuge.sml.9.png => mauler-sml.9.png} (100%)
 create mode 100644 sc2/content/base/ships/druuge/mauler-sml.ani
 rename sc2/content/base/ships/druuge/{druditty.mod => mauler.mod} (100%)
 rename sc2/content/base/ships/druuge/{drusound.snd => mauler.snd} (100%)
 rename sc2/content/base/ships/druuge/{drutext.txt => mauler.txt} (100%)

diff --git a/sc2/content/base/ships/chmmr/chmmr.big.0.png b/sc2/content/base/ships/chmmr/avatar-big.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.0.png
rename to sc2/content/base/ships/chmmr/avatar-big.0.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.1.png b/sc2/content/base/ships/chmmr/avatar-big.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.1.png
rename to sc2/content/base/ships/chmmr/avatar-big.1.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.10.png b/sc2/content/base/ships/chmmr/avatar-big.10.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.10.png
rename to sc2/content/base/ships/chmmr/avatar-big.10.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.11.png b/sc2/content/base/ships/chmmr/avatar-big.11.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.11.png
rename to sc2/content/base/ships/chmmr/avatar-big.11.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.12.png b/sc2/content/base/ships/chmmr/avatar-big.12.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.12.png
rename to sc2/content/base/ships/chmmr/avatar-big.12.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.13.png b/sc2/content/base/ships/chmmr/avatar-big.13.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.13.png
rename to sc2/content/base/ships/chmmr/avatar-big.13.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.14.png b/sc2/content/base/ships/chmmr/avatar-big.14.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.14.png
rename to sc2/content/base/ships/chmmr/avatar-big.14.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.15.png b/sc2/content/base/ships/chmmr/avatar-big.15.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.15.png
rename to sc2/content/base/ships/chmmr/avatar-big.15.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.2.png b/sc2/content/base/ships/chmmr/avatar-big.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.2.png
rename to sc2/content/base/ships/chmmr/avatar-big.2.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.3.png b/sc2/content/base/ships/chmmr/avatar-big.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.3.png
rename to sc2/content/base/ships/chmmr/avatar-big.3.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.4.png b/sc2/content/base/ships/chmmr/avatar-big.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.4.png
rename to sc2/content/base/ships/chmmr/avatar-big.4.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.5.png b/sc2/content/base/ships/chmmr/avatar-big.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.5.png
rename to sc2/content/base/ships/chmmr/avatar-big.5.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.6.png b/sc2/content/base/ships/chmmr/avatar-big.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.6.png
rename to sc2/content/base/ships/chmmr/avatar-big.6.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.7.png b/sc2/content/base/ships/chmmr/avatar-big.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.7.png
rename to sc2/content/base/ships/chmmr/avatar-big.7.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.8.png b/sc2/content/base/ships/chmmr/avatar-big.8.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.8.png
rename to sc2/content/base/ships/chmmr/avatar-big.8.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.big.9.png b/sc2/content/base/ships/chmmr/avatar-big.9.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.big.9.png
rename to sc2/content/base/ships/chmmr/avatar-big.9.png
diff --git a/sc2/content/base/ships/chmmr/avatar-big.ani b/sc2/content/base/ships/chmmr/avatar-big.ani
new file mode 100644
index 000000000..9099ef875
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/avatar-big.ani
@@ -0,0 +1,16 @@
+avatar-big.0.png 0 1 18 20
+avatar-big.1.png 0 1 21 19
+avatar-big.2.png 0 1 18 18
+avatar-big.3.png 0 1 19 15
+avatar-big.4.png 0 1 18 18
+avatar-big.5.png 0 1 18 20
+avatar-big.6.png 0 1 18 18
+avatar-big.7.png 0 1 21 19
+avatar-big.8.png 0 1 18 17
+avatar-big.9.png 0 1 15 19
+avatar-big.10.png 0 1 18 18
+avatar-big.11.png 0 1 21 20
+avatar-big.12.png 0 1 21 18
+avatar-big.13.png 0 1 20 14
+avatar-big.14.png 0 1 18 17
+avatar-big.15.png 0 1 15 19
diff --git a/sc2/content/base/ships/chmmr/chmcap.0.png b/sc2/content/base/ships/chmmr/avatar-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.0.png
rename to sc2/content/base/ships/chmmr/avatar-cap.0.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.1.png b/sc2/content/base/ships/chmmr/avatar-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.1.png
rename to sc2/content/base/ships/chmmr/avatar-cap.1.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.10.png b/sc2/content/base/ships/chmmr/avatar-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.10.png
rename to sc2/content/base/ships/chmmr/avatar-cap.10.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.11.png b/sc2/content/base/ships/chmmr/avatar-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.11.png
rename to sc2/content/base/ships/chmmr/avatar-cap.11.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.12.png b/sc2/content/base/ships/chmmr/avatar-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.12.png
rename to sc2/content/base/ships/chmmr/avatar-cap.12.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.13.png b/sc2/content/base/ships/chmmr/avatar-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.13.png
rename to sc2/content/base/ships/chmmr/avatar-cap.13.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.14.png b/sc2/content/base/ships/chmmr/avatar-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.14.png
rename to sc2/content/base/ships/chmmr/avatar-cap.14.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.2.png b/sc2/content/base/ships/chmmr/avatar-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.2.png
rename to sc2/content/base/ships/chmmr/avatar-cap.2.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.3.png b/sc2/content/base/ships/chmmr/avatar-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.3.png
rename to sc2/content/base/ships/chmmr/avatar-cap.3.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.4.png b/sc2/content/base/ships/chmmr/avatar-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.4.png
rename to sc2/content/base/ships/chmmr/avatar-cap.4.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.5.png b/sc2/content/base/ships/chmmr/avatar-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.5.png
rename to sc2/content/base/ships/chmmr/avatar-cap.5.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.6.png b/sc2/content/base/ships/chmmr/avatar-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.6.png
rename to sc2/content/base/ships/chmmr/avatar-cap.6.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.7.png b/sc2/content/base/ships/chmmr/avatar-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.7.png
rename to sc2/content/base/ships/chmmr/avatar-cap.7.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.8.png b/sc2/content/base/ships/chmmr/avatar-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.8.png
rename to sc2/content/base/ships/chmmr/avatar-cap.8.png
diff --git a/sc2/content/base/ships/chmmr/chmcap.9.png b/sc2/content/base/ships/chmmr/avatar-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmcap.9.png
rename to sc2/content/base/ships/chmmr/avatar-cap.9.png
diff --git a/sc2/content/base/ships/chmmr/avatar-cap.ani b/sc2/content/base/ships/chmmr/avatar-cap.ani
new file mode 100644
index 000000000..c157fb623
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/avatar-cap.ani
@@ -0,0 +1,15 @@
+avatar-cap.0.png -1 1 0 0
+avatar-cap.1.png 1 1 0 -2
+avatar-cap.2.png 1 1 0 -2
+avatar-cap.3.png 1 1 0 -2
+avatar-cap.4.png 1 1 0 -2
+avatar-cap.5.png 1 1 0 -2
+avatar-cap.6.png 0 1 -27 -2
+avatar-cap.7.png 0 1 -27 -2
+avatar-cap.8.png 0 1 -27 -2
+avatar-cap.9.png 1 1 -12 0
+avatar-cap.10.png 1 1 -12 0
+avatar-cap.11.png 0 1 -12 0
+avatar-cap.12.png 1 1 -37 0
+avatar-cap.13.png 1 1 -37 0
+avatar-cap.14.png 1 1 -37 0
diff --git a/sc2/content/base/ships/chmmr/chmicons.0.png b/sc2/content/base/ships/chmmr/avatar-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmicons.0.png
rename to sc2/content/base/ships/chmmr/avatar-icons.0.png
diff --git a/sc2/content/base/ships/chmmr/chmicons.1.png b/sc2/content/base/ships/chmmr/avatar-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmicons.1.png
rename to sc2/content/base/ships/chmmr/avatar-icons.1.png
diff --git a/sc2/content/base/ships/chmmr/avatar-icons.ani b/sc2/content/base/ships/chmmr/avatar-icons.ani
new file mode 100644
index 000000000..27a50a8c4
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/avatar-icons.ani
@@ -0,0 +1,2 @@
+avatar-icons.0.png 0 1 0 0
+avatar-icons.1.png 0 1 20 16
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.0.png b/sc2/content/base/ships/chmmr/avatar-med.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.0.png
rename to sc2/content/base/ships/chmmr/avatar-med.0.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.1.png b/sc2/content/base/ships/chmmr/avatar-med.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.1.png
rename to sc2/content/base/ships/chmmr/avatar-med.1.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.10.png b/sc2/content/base/ships/chmmr/avatar-med.10.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.10.png
rename to sc2/content/base/ships/chmmr/avatar-med.10.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.11.png b/sc2/content/base/ships/chmmr/avatar-med.11.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.11.png
rename to sc2/content/base/ships/chmmr/avatar-med.11.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.12.png b/sc2/content/base/ships/chmmr/avatar-med.12.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.12.png
rename to sc2/content/base/ships/chmmr/avatar-med.12.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.13.png b/sc2/content/base/ships/chmmr/avatar-med.13.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.13.png
rename to sc2/content/base/ships/chmmr/avatar-med.13.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.14.png b/sc2/content/base/ships/chmmr/avatar-med.14.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.14.png
rename to sc2/content/base/ships/chmmr/avatar-med.14.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.15.png b/sc2/content/base/ships/chmmr/avatar-med.15.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.15.png
rename to sc2/content/base/ships/chmmr/avatar-med.15.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.2.png b/sc2/content/base/ships/chmmr/avatar-med.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.2.png
rename to sc2/content/base/ships/chmmr/avatar-med.2.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.3.png b/sc2/content/base/ships/chmmr/avatar-med.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.3.png
rename to sc2/content/base/ships/chmmr/avatar-med.3.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.4.png b/sc2/content/base/ships/chmmr/avatar-med.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.4.png
rename to sc2/content/base/ships/chmmr/avatar-med.4.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.5.png b/sc2/content/base/ships/chmmr/avatar-med.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.5.png
rename to sc2/content/base/ships/chmmr/avatar-med.5.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.6.png b/sc2/content/base/ships/chmmr/avatar-med.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.6.png
rename to sc2/content/base/ships/chmmr/avatar-med.6.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.7.png b/sc2/content/base/ships/chmmr/avatar-med.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.7.png
rename to sc2/content/base/ships/chmmr/avatar-med.7.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.8.png b/sc2/content/base/ships/chmmr/avatar-med.8.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.8.png
rename to sc2/content/base/ships/chmmr/avatar-med.8.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.med.9.png b/sc2/content/base/ships/chmmr/avatar-med.9.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.med.9.png
rename to sc2/content/base/ships/chmmr/avatar-med.9.png
diff --git a/sc2/content/base/ships/chmmr/avatar-med.ani b/sc2/content/base/ships/chmmr/avatar-med.ani
new file mode 100644
index 000000000..b11e93764
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/avatar-med.ani
@@ -0,0 +1,16 @@
+avatar-med.0.png 0 1 9 9
+avatar-med.1.png 0 1 10 9
+avatar-med.2.png 0 1 10 9
+avatar-med.3.png 0 1 9 7
+avatar-med.4.png 0 1 8 9
+avatar-med.5.png 0 1 9 10
+avatar-med.6.png 0 1 10 9
+avatar-med.7.png 0 1 10 9
+avatar-med.8.png 0 1 9 8
+avatar-med.9.png 0 1 7 9
+avatar-med.10.png 0 1 8 9
+avatar-med.11.png 0 1 9 10
+avatar-med.12.png 0 1 10 9
+avatar-med.13.png 0 1 9 7
+avatar-med.14.png 0 1 8 9
+avatar-med.15.png 0 1 7 9
diff --git a/sc2/content/base/ships/chmmr/chmmicon.0.png b/sc2/content/base/ships/chmmr/avatar-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmicon.0.png
rename to sc2/content/base/ships/chmmr/avatar-meleeicons.0.png
diff --git a/sc2/content/base/ships/chmmr/chmmicon.1.png b/sc2/content/base/ships/chmmr/avatar-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmicon.1.png
rename to sc2/content/base/ships/chmmr/avatar-meleeicons.1.png
diff --git a/sc2/content/base/ships/chmmr/avatar-meleeicons.ani b/sc2/content/base/ships/chmmr/avatar-meleeicons.ani
new file mode 100644
index 000000000..28db0660f
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/avatar-meleeicons.ani
@@ -0,0 +1,2 @@
+avatar-meleeicons.0.png 0 1 16 15
+avatar-meleeicons.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.0.png b/sc2/content/base/ships/chmmr/avatar-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.0.png
rename to sc2/content/base/ships/chmmr/avatar-sml.0.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.1.png b/sc2/content/base/ships/chmmr/avatar-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.1.png
rename to sc2/content/base/ships/chmmr/avatar-sml.1.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.10.png b/sc2/content/base/ships/chmmr/avatar-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.10.png
rename to sc2/content/base/ships/chmmr/avatar-sml.10.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.11.png b/sc2/content/base/ships/chmmr/avatar-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.11.png
rename to sc2/content/base/ships/chmmr/avatar-sml.11.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.12.png b/sc2/content/base/ships/chmmr/avatar-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.12.png
rename to sc2/content/base/ships/chmmr/avatar-sml.12.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.13.png b/sc2/content/base/ships/chmmr/avatar-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.13.png
rename to sc2/content/base/ships/chmmr/avatar-sml.13.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.14.png b/sc2/content/base/ships/chmmr/avatar-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.14.png
rename to sc2/content/base/ships/chmmr/avatar-sml.14.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.15.png b/sc2/content/base/ships/chmmr/avatar-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.15.png
rename to sc2/content/base/ships/chmmr/avatar-sml.15.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.2.png b/sc2/content/base/ships/chmmr/avatar-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.2.png
rename to sc2/content/base/ships/chmmr/avatar-sml.2.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.3.png b/sc2/content/base/ships/chmmr/avatar-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.3.png
rename to sc2/content/base/ships/chmmr/avatar-sml.3.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.4.png b/sc2/content/base/ships/chmmr/avatar-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.4.png
rename to sc2/content/base/ships/chmmr/avatar-sml.4.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.5.png b/sc2/content/base/ships/chmmr/avatar-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.5.png
rename to sc2/content/base/ships/chmmr/avatar-sml.5.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.6.png b/sc2/content/base/ships/chmmr/avatar-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.6.png
rename to sc2/content/base/ships/chmmr/avatar-sml.6.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.7.png b/sc2/content/base/ships/chmmr/avatar-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.7.png
rename to sc2/content/base/ships/chmmr/avatar-sml.7.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.8.png b/sc2/content/base/ships/chmmr/avatar-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.8.png
rename to sc2/content/base/ships/chmmr/avatar-sml.8.png
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml.9.png b/sc2/content/base/ships/chmmr/avatar-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmmr.sml.9.png
rename to sc2/content/base/ships/chmmr/avatar-sml.9.png
diff --git a/sc2/content/base/ships/chmmr/avatar-sml.ani b/sc2/content/base/ships/chmmr/avatar-sml.ani
new file mode 100644
index 000000000..700fe0e89
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/avatar-sml.ani
@@ -0,0 +1,16 @@
+avatar-sml.0.png 0 1 4 5
+avatar-sml.1.png 0 1 5 5
+avatar-sml.2.png 0 1 4 4
+avatar-sml.3.png 0 1 4 3
+avatar-sml.4.png 0 1 4 4
+avatar-sml.5.png 0 1 4 5
+avatar-sml.6.png 0 1 4 4
+avatar-sml.7.png 0 1 5 4
+avatar-sml.8.png 0 1 4 4
+avatar-sml.9.png 0 1 3 4
+avatar-sml.10.png 0 1 4 4
+avatar-sml.11.png 0 1 5 5
+avatar-sml.12.png 0 1 5 4
+avatar-sml.13.png 0 1 5 3
+avatar-sml.14.png 0 1 4 4
+avatar-sml.15.png 0 1 3 5
diff --git a/sc2/content/base/ships/chmmr/chmditty.mod b/sc2/content/base/ships/chmmr/avatar.mod
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmditty.mod
rename to sc2/content/base/ships/chmmr/avatar.mod
diff --git a/sc2/content/base/ships/chmmr/chmsound.snd b/sc2/content/base/ships/chmmr/avatar.snd
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmsound.snd
rename to sc2/content/base/ships/chmmr/avatar.snd
diff --git a/sc2/content/base/ships/chmmr/chmtext.txt b/sc2/content/base/ships/chmmr/avatar.txt
similarity index 100%
rename from sc2/content/base/ships/chmmr/chmtext.txt
rename to sc2/content/base/ships/chmmr/avatar.txt
diff --git a/sc2/content/base/ships/chmmr/chmcap.ani b/sc2/content/base/ships/chmmr/chmcap.ani
deleted file mode 100644
index 8b8b7bcd1..000000000
--- a/sc2/content/base/ships/chmmr/chmcap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-chmcap.0.png -1 1 0 0
-chmcap.1.png 1 1 0 -2
-chmcap.2.png 1 1 0 -2
-chmcap.3.png 1 1 0 -2
-chmcap.4.png 1 1 0 -2
-chmcap.5.png 1 1 0 -2
-chmcap.6.png 0 1 -27 -2
-chmcap.7.png 0 1 -27 -2
-chmcap.8.png 0 1 -27 -2
-chmcap.9.png 1 1 -12 0
-chmcap.10.png 1 1 -12 0
-chmcap.11.png 0 1 -12 0
-chmcap.12.png 1 1 -37 0
-chmcap.13.png 1 1 -37 0
-chmcap.14.png 1 1 -37 0
diff --git a/sc2/content/base/ships/chmmr/chmicons.ani b/sc2/content/base/ships/chmmr/chmicons.ani
deleted file mode 100644
index 512b4f2ab..000000000
--- a/sc2/content/base/ships/chmmr/chmicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-chmicons.0.png 0 1 0 0
-chmicons.1.png 0 1 20 16
diff --git a/sc2/content/base/ships/chmmr/chmmicon.ani b/sc2/content/base/ships/chmmr/chmmicon.ani
deleted file mode 100644
index 9125be130..000000000
--- a/sc2/content/base/ships/chmmr/chmmicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-chmmicon.0.png 0 1 16 15
-chmmicon.1.png 0 1 4 4
diff --git a/sc2/content/base/ships/chmmr/chmmr.big b/sc2/content/base/ships/chmmr/chmmr.big
deleted file mode 100644
index c332ac614..000000000
--- a/sc2/content/base/ships/chmmr/chmmr.big
+++ /dev/null
@@ -1,16 +0,0 @@
-chmmr.big.0.png 0 1 18 20
-chmmr.big.1.png 0 1 21 19
-chmmr.big.2.png 0 1 18 18
-chmmr.big.3.png 0 1 19 15
-chmmr.big.4.png 0 1 18 18
-chmmr.big.5.png 0 1 18 20
-chmmr.big.6.png 0 1 18 18
-chmmr.big.7.png 0 1 21 19
-chmmr.big.8.png 0 1 18 17
-chmmr.big.9.png 0 1 15 19
-chmmr.big.10.png 0 1 18 18
-chmmr.big.11.png 0 1 21 20
-chmmr.big.12.png 0 1 21 18
-chmmr.big.13.png 0 1 20 14
-chmmr.big.14.png 0 1 18 17
-chmmr.big.15.png 0 1 15 19
diff --git a/sc2/content/base/ships/chmmr/chmmr.med b/sc2/content/base/ships/chmmr/chmmr.med
deleted file mode 100644
index cb251f77c..000000000
--- a/sc2/content/base/ships/chmmr/chmmr.med
+++ /dev/null
@@ -1,16 +0,0 @@
-chmmr.med.0.png 0 1 9 9
-chmmr.med.1.png 0 1 10 9
-chmmr.med.2.png 0 1 10 9
-chmmr.med.3.png 0 1 9 7
-chmmr.med.4.png 0 1 8 9
-chmmr.med.5.png 0 1 9 10
-chmmr.med.6.png 0 1 10 9
-chmmr.med.7.png 0 1 10 9
-chmmr.med.8.png 0 1 9 8
-chmmr.med.9.png 0 1 7 9
-chmmr.med.10.png 0 1 8 9
-chmmr.med.11.png 0 1 9 10
-chmmr.med.12.png 0 1 10 9
-chmmr.med.13.png 0 1 9 7
-chmmr.med.14.png 0 1 8 9
-chmmr.med.15.png 0 1 7 9
diff --git a/sc2/content/base/ships/chmmr/chmmr.sml b/sc2/content/base/ships/chmmr/chmmr.sml
deleted file mode 100644
index e11adcd04..000000000
--- a/sc2/content/base/ships/chmmr/chmmr.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-chmmr.sml.0.png 0 1 4 5
-chmmr.sml.1.png 0 1 5 5
-chmmr.sml.2.png 0 1 4 4
-chmmr.sml.3.png 0 1 4 3
-chmmr.sml.4.png 0 1 4 4
-chmmr.sml.5.png 0 1 4 5
-chmmr.sml.6.png 0 1 4 4
-chmmr.sml.7.png 0 1 5 4
-chmmr.sml.8.png 0 1 4 4
-chmmr.sml.9.png 0 1 3 4
-chmmr.sml.10.png 0 1 4 4
-chmmr.sml.11.png 0 1 5 5
-chmmr.sml.12.png 0 1 5 4
-chmmr.sml.13.png 0 1 5 3
-chmmr.sml.14.png 0 1 4 4
-chmmr.sml.15.png 0 1 3 5
diff --git a/sc2/content/base/ships/chmmr/muzbig.ani b/sc2/content/base/ships/chmmr/muzbig.ani
deleted file mode 100644
index dc9b5694a..000000000
--- a/sc2/content/base/ships/chmmr/muzbig.ani
+++ /dev/null
@@ -1,41 +0,0 @@
-muzbig.0.png 0 1 0 22
-muzbig.1.png 0 1 -11 20
-muzbig.2.png 0 1 -16 17
-muzbig.3.png 0 1 -21 10
-muzbig.4.png 0 1 -22 0
-muzbig.5.png 0 1 -22 -10
-muzbig.6.png 0 1 -17 -16
-muzbig.7.png 0 1 -11 -20
-muzbig.8.png 0 1 0 -22
-muzbig.9.png 0 1 11 -20
-muzbig.10.png 0 1 17 -16
-muzbig.11.png 0 1 22 -10
-muzbig.12.png 0 1 23 0
-muzbig.13.png 0 1 22 10
-muzbig.14.png 0 1 17 16
-muzbig.15.png 0 1 11 20
-muzbig.16.png 0 1 2 21
-muzbig.17.png 0 1 -6 19
-muzbig.18.png 0 1 -11 16
-muzbig.19.png 0 1 -14 9
-muzbig.20.png 0 1 -17 2
-muzbig.21.png 0 1 -15 -5
-muzbig.22.png 0 1 -12 -11
-muzbig.23.png 0 1 -6 -13
-muzbig.24.png 0 1 2 -17
-muzbig.25.png 0 1 10 -13
-muzbig.26.png 0 1 16 -11
-muzbig.27.png 0 1 21 -5
-muzbig.28.png 0 1 22 2
-muzbig.29.png 0 1 21 9
-muzbig.30.png 0 1 16 15
-muzbig.31.png 0 1 10 19
-muzbig.32.png 0 1 3 4
-muzbig.33.png 0 1 3 4
-muzbig.34.png 0 1 5 5
-muzbig.35.png 0 1 5 5
-muzbig.36.png 0 1 6 5
-muzbig.37.png 0 1 6 4
-muzbig.38.png 0 1 6 4
-muzbig.39.png 0 1 5 3
-muzbig.40.png 0 1 5 0
diff --git a/sc2/content/base/ships/chmmr/muzmed.ani b/sc2/content/base/ships/chmmr/muzmed.ani
deleted file mode 100644
index 6cdea1f86..000000000
--- a/sc2/content/base/ships/chmmr/muzmed.ani
+++ /dev/null
@@ -1,41 +0,0 @@
-muzmed.0.png 0 1 0 -11
-muzmed.1.png 0 1 5 -12
-muzmed.2.png 0 1 9 -9
-muzmed.3.png 0 1 10 -5
-muzmed.4.png 0 1 12 0
-muzmed.5.png 0 1 10 5
-muzmed.6.png 0 1 9 10
-muzmed.7.png 0 1 6 12
-muzmed.8.png 0 1 0 12
-muzmed.9.png 0 1 -6 13
-muzmed.10.png 0 1 -9 10
-muzmed.11.png 0 1 -10 5
-muzmed.12.png 0 1 -12 0
-muzmed.13.png 0 1 -10 -6
-muzmed.14.png 0 1 -9 -9
-muzmed.15.png 0 1 -6 -12
-muzmed.16.png 0 1 1 10
-muzmed.17.png -1 1 -4 10
-muzmed.18.png 0 1 -5 8
-muzmed.19.png 0 1 -8 4
-muzmed.20.png 0 1 -9 1
-muzmed.21.png -1 1 -8 -3
-muzmed.22.png 0 1 -5 -6
-muzmed.23.png 0 1 -4 -8
-muzmed.24.png 0 1 1 -9
-muzmed.25.png -1 1 5 -8
-muzmed.26.png 0 1 8 -6
-muzmed.27.png 0 1 10 -3
-muzmed.28.png 0 1 11 1
-muzmed.29.png -1 1 10 4
-muzmed.30.png 0 1 8 8
-muzmed.31.png 0 1 5 10
-muzmed.32.png 0 1 3 4
-muzmed.33.png 0 1 3 4
-muzmed.34.png 0 1 5 5
-muzmed.35.png 0 1 5 5
-muzmed.36.png 0 1 6 5
-muzmed.37.png 0 1 6 4
-muzmed.38.png 0 1 6 4
-muzmed.39.png 0 1 5 3
-muzmed.40.png 0 1 5 0
diff --git a/sc2/content/base/ships/chmmr/muzsml.ani b/sc2/content/base/ships/chmmr/muzsml.ani
deleted file mode 100644
index 74720b3a6..000000000
--- a/sc2/content/base/ships/chmmr/muzsml.ani
+++ /dev/null
@@ -1,41 +0,0 @@
-muzsml.0.png 0 1 0 -7
-muzsml.1.png 0 1 3 -6
-muzsml.2.png 0 1 5 -5
-muzsml.3.png 0 1 6 -3
-muzsml.4.png 0 1 7 0
-muzsml.5.png 0 1 6 3
-muzsml.6.png 0 1 5 5
-muzsml.7.png 0 1 3 6
-muzsml.8.png 0 1 0 7
-muzsml.9.png 0 1 -3 6
-muzsml.10.png 0 1 -5 -5
-muzsml.11.png 0 1 -6 3
-muzsml.12.png 0 1 -7 0
-muzsml.13.png 0 1 -6 -3
-muzsml.14.png 0 1 -5 -5
-muzsml.15.png 0 1 -3 -6
-muzsml.16.png -1 1 0 6
-muzsml.17.png -1 1 -2 5
-muzsml.18.png 0 1 -3 4
-muzsml.19.png -1 1 -4 2
-muzsml.20.png -1 1 -5 0
-muzsml.21.png -1 1 -4 -2
-muzsml.22.png 0 1 -3 -3
-muzsml.23.png -1 1 -2 -4
-muzsml.24.png -1 1 0 -5
-muzsml.25.png -1 1 2 -4
-muzsml.26.png 0 1 4 -3
-muzsml.27.png -1 1 5 -2
-muzsml.28.png -1 1 6 0
-muzsml.29.png -1 1 5 2
-muzsml.30.png 0 1 4 4
-muzsml.31.png -1 1 2 5
-muzsml.32.png 0 1 2 2
-muzsml.33.png 0 1 2 2
-muzsml.34.png 0 1 3 2
-muzsml.35.png 0 1 3 3
-muzsml.36.png 0 1 3 2
-muzsml.37.png 0 1 4 2
-muzsml.38.png 0 1 3 2
-muzsml.39.png 0 1 3 1
-muzsml.40.png 0 1 3 0
diff --git a/sc2/content/base/ships/chmmr/muzbig.0.png b/sc2/content/base/ships/chmmr/muzzle-big.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.0.png
rename to sc2/content/base/ships/chmmr/muzzle-big.0.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.1.png b/sc2/content/base/ships/chmmr/muzzle-big.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.1.png
rename to sc2/content/base/ships/chmmr/muzzle-big.1.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.10.png b/sc2/content/base/ships/chmmr/muzzle-big.10.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.10.png
rename to sc2/content/base/ships/chmmr/muzzle-big.10.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.11.png b/sc2/content/base/ships/chmmr/muzzle-big.11.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.11.png
rename to sc2/content/base/ships/chmmr/muzzle-big.11.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.12.png b/sc2/content/base/ships/chmmr/muzzle-big.12.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.12.png
rename to sc2/content/base/ships/chmmr/muzzle-big.12.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.13.png b/sc2/content/base/ships/chmmr/muzzle-big.13.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.13.png
rename to sc2/content/base/ships/chmmr/muzzle-big.13.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.14.png b/sc2/content/base/ships/chmmr/muzzle-big.14.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.14.png
rename to sc2/content/base/ships/chmmr/muzzle-big.14.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.15.png b/sc2/content/base/ships/chmmr/muzzle-big.15.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.15.png
rename to sc2/content/base/ships/chmmr/muzzle-big.15.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.16.png b/sc2/content/base/ships/chmmr/muzzle-big.16.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.16.png
rename to sc2/content/base/ships/chmmr/muzzle-big.16.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.17.png b/sc2/content/base/ships/chmmr/muzzle-big.17.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.17.png
rename to sc2/content/base/ships/chmmr/muzzle-big.17.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.18.png b/sc2/content/base/ships/chmmr/muzzle-big.18.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.18.png
rename to sc2/content/base/ships/chmmr/muzzle-big.18.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.19.png b/sc2/content/base/ships/chmmr/muzzle-big.19.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.19.png
rename to sc2/content/base/ships/chmmr/muzzle-big.19.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.2.png b/sc2/content/base/ships/chmmr/muzzle-big.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.2.png
rename to sc2/content/base/ships/chmmr/muzzle-big.2.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.20.png b/sc2/content/base/ships/chmmr/muzzle-big.20.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.20.png
rename to sc2/content/base/ships/chmmr/muzzle-big.20.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.21.png b/sc2/content/base/ships/chmmr/muzzle-big.21.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.21.png
rename to sc2/content/base/ships/chmmr/muzzle-big.21.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.22.png b/sc2/content/base/ships/chmmr/muzzle-big.22.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.22.png
rename to sc2/content/base/ships/chmmr/muzzle-big.22.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.23.png b/sc2/content/base/ships/chmmr/muzzle-big.23.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.23.png
rename to sc2/content/base/ships/chmmr/muzzle-big.23.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.24.png b/sc2/content/base/ships/chmmr/muzzle-big.24.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.24.png
rename to sc2/content/base/ships/chmmr/muzzle-big.24.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.25.png b/sc2/content/base/ships/chmmr/muzzle-big.25.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.25.png
rename to sc2/content/base/ships/chmmr/muzzle-big.25.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.26.png b/sc2/content/base/ships/chmmr/muzzle-big.26.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.26.png
rename to sc2/content/base/ships/chmmr/muzzle-big.26.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.27.png b/sc2/content/base/ships/chmmr/muzzle-big.27.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.27.png
rename to sc2/content/base/ships/chmmr/muzzle-big.27.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.28.png b/sc2/content/base/ships/chmmr/muzzle-big.28.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.28.png
rename to sc2/content/base/ships/chmmr/muzzle-big.28.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.29.png b/sc2/content/base/ships/chmmr/muzzle-big.29.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.29.png
rename to sc2/content/base/ships/chmmr/muzzle-big.29.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.3.png b/sc2/content/base/ships/chmmr/muzzle-big.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.3.png
rename to sc2/content/base/ships/chmmr/muzzle-big.3.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.30.png b/sc2/content/base/ships/chmmr/muzzle-big.30.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.30.png
rename to sc2/content/base/ships/chmmr/muzzle-big.30.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.31.png b/sc2/content/base/ships/chmmr/muzzle-big.31.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.31.png
rename to sc2/content/base/ships/chmmr/muzzle-big.31.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.32.png b/sc2/content/base/ships/chmmr/muzzle-big.32.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.32.png
rename to sc2/content/base/ships/chmmr/muzzle-big.32.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.33.png b/sc2/content/base/ships/chmmr/muzzle-big.33.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.33.png
rename to sc2/content/base/ships/chmmr/muzzle-big.33.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.34.png b/sc2/content/base/ships/chmmr/muzzle-big.34.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.34.png
rename to sc2/content/base/ships/chmmr/muzzle-big.34.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.35.png b/sc2/content/base/ships/chmmr/muzzle-big.35.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.35.png
rename to sc2/content/base/ships/chmmr/muzzle-big.35.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.36.png b/sc2/content/base/ships/chmmr/muzzle-big.36.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.36.png
rename to sc2/content/base/ships/chmmr/muzzle-big.36.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.37.png b/sc2/content/base/ships/chmmr/muzzle-big.37.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.37.png
rename to sc2/content/base/ships/chmmr/muzzle-big.37.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.38.png b/sc2/content/base/ships/chmmr/muzzle-big.38.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.38.png
rename to sc2/content/base/ships/chmmr/muzzle-big.38.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.39.png b/sc2/content/base/ships/chmmr/muzzle-big.39.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.39.png
rename to sc2/content/base/ships/chmmr/muzzle-big.39.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.4.png b/sc2/content/base/ships/chmmr/muzzle-big.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.4.png
rename to sc2/content/base/ships/chmmr/muzzle-big.4.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.40.png b/sc2/content/base/ships/chmmr/muzzle-big.40.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.40.png
rename to sc2/content/base/ships/chmmr/muzzle-big.40.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.5.png b/sc2/content/base/ships/chmmr/muzzle-big.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.5.png
rename to sc2/content/base/ships/chmmr/muzzle-big.5.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.6.png b/sc2/content/base/ships/chmmr/muzzle-big.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.6.png
rename to sc2/content/base/ships/chmmr/muzzle-big.6.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.7.png b/sc2/content/base/ships/chmmr/muzzle-big.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.7.png
rename to sc2/content/base/ships/chmmr/muzzle-big.7.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.8.png b/sc2/content/base/ships/chmmr/muzzle-big.8.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.8.png
rename to sc2/content/base/ships/chmmr/muzzle-big.8.png
diff --git a/sc2/content/base/ships/chmmr/muzbig.9.png b/sc2/content/base/ships/chmmr/muzzle-big.9.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzbig.9.png
rename to sc2/content/base/ships/chmmr/muzzle-big.9.png
diff --git a/sc2/content/base/ships/chmmr/muzzle-big.ani b/sc2/content/base/ships/chmmr/muzzle-big.ani
new file mode 100644
index 000000000..c2a9ad91e
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/muzzle-big.ani
@@ -0,0 +1,41 @@
+muzzle-big.0.png 0 1 0 22
+muzzle-big.1.png 0 1 -11 20
+muzzle-big.2.png 0 1 -16 17
+muzzle-big.3.png 0 1 -21 10
+muzzle-big.4.png 0 1 -22 0
+muzzle-big.5.png 0 1 -22 -10
+muzzle-big.6.png 0 1 -17 -16
+muzzle-big.7.png 0 1 -11 -20
+muzzle-big.8.png 0 1 0 -22
+muzzle-big.9.png 0 1 11 -20
+muzzle-big.10.png 0 1 17 -16
+muzzle-big.11.png 0 1 22 -10
+muzzle-big.12.png 0 1 23 0
+muzzle-big.13.png 0 1 22 10
+muzzle-big.14.png 0 1 17 16
+muzzle-big.15.png 0 1 11 20
+muzzle-big.16.png 0 1 2 21
+muzzle-big.17.png 0 1 -6 19
+muzzle-big.18.png 0 1 -11 16
+muzzle-big.19.png 0 1 -14 9
+muzzle-big.20.png 0 1 -17 2
+muzzle-big.21.png 0 1 -15 -5
+muzzle-big.22.png 0 1 -12 -11
+muzzle-big.23.png 0 1 -6 -13
+muzzle-big.24.png 0 1 2 -17
+muzzle-big.25.png 0 1 10 -13
+muzzle-big.26.png 0 1 16 -11
+muzzle-big.27.png 0 1 21 -5
+muzzle-big.28.png 0 1 22 2
+muzzle-big.29.png 0 1 21 9
+muzzle-big.30.png 0 1 16 15
+muzzle-big.31.png 0 1 10 19
+muzzle-big.32.png 0 1 3 4
+muzzle-big.33.png 0 1 3 4
+muzzle-big.34.png 0 1 5 5
+muzzle-big.35.png 0 1 5 5
+muzzle-big.36.png 0 1 6 5
+muzzle-big.37.png 0 1 6 4
+muzzle-big.38.png 0 1 6 4
+muzzle-big.39.png 0 1 5 3
+muzzle-big.40.png 0 1 5 0
diff --git a/sc2/content/base/ships/chmmr/muzmed.0.png b/sc2/content/base/ships/chmmr/muzzle-med.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.0.png
rename to sc2/content/base/ships/chmmr/muzzle-med.0.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.1.png b/sc2/content/base/ships/chmmr/muzzle-med.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.1.png
rename to sc2/content/base/ships/chmmr/muzzle-med.1.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.10.png b/sc2/content/base/ships/chmmr/muzzle-med.10.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.10.png
rename to sc2/content/base/ships/chmmr/muzzle-med.10.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.11.png b/sc2/content/base/ships/chmmr/muzzle-med.11.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.11.png
rename to sc2/content/base/ships/chmmr/muzzle-med.11.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.12.png b/sc2/content/base/ships/chmmr/muzzle-med.12.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.12.png
rename to sc2/content/base/ships/chmmr/muzzle-med.12.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.13.png b/sc2/content/base/ships/chmmr/muzzle-med.13.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.13.png
rename to sc2/content/base/ships/chmmr/muzzle-med.13.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.14.png b/sc2/content/base/ships/chmmr/muzzle-med.14.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.14.png
rename to sc2/content/base/ships/chmmr/muzzle-med.14.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.15.png b/sc2/content/base/ships/chmmr/muzzle-med.15.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.15.png
rename to sc2/content/base/ships/chmmr/muzzle-med.15.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.16.png b/sc2/content/base/ships/chmmr/muzzle-med.16.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.16.png
rename to sc2/content/base/ships/chmmr/muzzle-med.16.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.17.png b/sc2/content/base/ships/chmmr/muzzle-med.17.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.17.png
rename to sc2/content/base/ships/chmmr/muzzle-med.17.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.18.png b/sc2/content/base/ships/chmmr/muzzle-med.18.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.18.png
rename to sc2/content/base/ships/chmmr/muzzle-med.18.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.19.png b/sc2/content/base/ships/chmmr/muzzle-med.19.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.19.png
rename to sc2/content/base/ships/chmmr/muzzle-med.19.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.2.png b/sc2/content/base/ships/chmmr/muzzle-med.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.2.png
rename to sc2/content/base/ships/chmmr/muzzle-med.2.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.20.png b/sc2/content/base/ships/chmmr/muzzle-med.20.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.20.png
rename to sc2/content/base/ships/chmmr/muzzle-med.20.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.21.png b/sc2/content/base/ships/chmmr/muzzle-med.21.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.21.png
rename to sc2/content/base/ships/chmmr/muzzle-med.21.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.22.png b/sc2/content/base/ships/chmmr/muzzle-med.22.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.22.png
rename to sc2/content/base/ships/chmmr/muzzle-med.22.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.23.png b/sc2/content/base/ships/chmmr/muzzle-med.23.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.23.png
rename to sc2/content/base/ships/chmmr/muzzle-med.23.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.24.png b/sc2/content/base/ships/chmmr/muzzle-med.24.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.24.png
rename to sc2/content/base/ships/chmmr/muzzle-med.24.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.25.png b/sc2/content/base/ships/chmmr/muzzle-med.25.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.25.png
rename to sc2/content/base/ships/chmmr/muzzle-med.25.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.26.png b/sc2/content/base/ships/chmmr/muzzle-med.26.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.26.png
rename to sc2/content/base/ships/chmmr/muzzle-med.26.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.27.png b/sc2/content/base/ships/chmmr/muzzle-med.27.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.27.png
rename to sc2/content/base/ships/chmmr/muzzle-med.27.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.28.png b/sc2/content/base/ships/chmmr/muzzle-med.28.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.28.png
rename to sc2/content/base/ships/chmmr/muzzle-med.28.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.29.png b/sc2/content/base/ships/chmmr/muzzle-med.29.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.29.png
rename to sc2/content/base/ships/chmmr/muzzle-med.29.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.3.png b/sc2/content/base/ships/chmmr/muzzle-med.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.3.png
rename to sc2/content/base/ships/chmmr/muzzle-med.3.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.30.png b/sc2/content/base/ships/chmmr/muzzle-med.30.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.30.png
rename to sc2/content/base/ships/chmmr/muzzle-med.30.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.31.png b/sc2/content/base/ships/chmmr/muzzle-med.31.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.31.png
rename to sc2/content/base/ships/chmmr/muzzle-med.31.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.32.png b/sc2/content/base/ships/chmmr/muzzle-med.32.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.32.png
rename to sc2/content/base/ships/chmmr/muzzle-med.32.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.33.png b/sc2/content/base/ships/chmmr/muzzle-med.33.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.33.png
rename to sc2/content/base/ships/chmmr/muzzle-med.33.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.34.png b/sc2/content/base/ships/chmmr/muzzle-med.34.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.34.png
rename to sc2/content/base/ships/chmmr/muzzle-med.34.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.35.png b/sc2/content/base/ships/chmmr/muzzle-med.35.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.35.png
rename to sc2/content/base/ships/chmmr/muzzle-med.35.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.36.png b/sc2/content/base/ships/chmmr/muzzle-med.36.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.36.png
rename to sc2/content/base/ships/chmmr/muzzle-med.36.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.37.png b/sc2/content/base/ships/chmmr/muzzle-med.37.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.37.png
rename to sc2/content/base/ships/chmmr/muzzle-med.37.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.38.png b/sc2/content/base/ships/chmmr/muzzle-med.38.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.38.png
rename to sc2/content/base/ships/chmmr/muzzle-med.38.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.39.png b/sc2/content/base/ships/chmmr/muzzle-med.39.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.39.png
rename to sc2/content/base/ships/chmmr/muzzle-med.39.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.4.png b/sc2/content/base/ships/chmmr/muzzle-med.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.4.png
rename to sc2/content/base/ships/chmmr/muzzle-med.4.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.40.png b/sc2/content/base/ships/chmmr/muzzle-med.40.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.40.png
rename to sc2/content/base/ships/chmmr/muzzle-med.40.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.5.png b/sc2/content/base/ships/chmmr/muzzle-med.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.5.png
rename to sc2/content/base/ships/chmmr/muzzle-med.5.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.6.png b/sc2/content/base/ships/chmmr/muzzle-med.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.6.png
rename to sc2/content/base/ships/chmmr/muzzle-med.6.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.7.png b/sc2/content/base/ships/chmmr/muzzle-med.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.7.png
rename to sc2/content/base/ships/chmmr/muzzle-med.7.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.8.png b/sc2/content/base/ships/chmmr/muzzle-med.8.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.8.png
rename to sc2/content/base/ships/chmmr/muzzle-med.8.png
diff --git a/sc2/content/base/ships/chmmr/muzmed.9.png b/sc2/content/base/ships/chmmr/muzzle-med.9.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzmed.9.png
rename to sc2/content/base/ships/chmmr/muzzle-med.9.png
diff --git a/sc2/content/base/ships/chmmr/muzzle-med.ani b/sc2/content/base/ships/chmmr/muzzle-med.ani
new file mode 100644
index 000000000..fb208ac13
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/muzzle-med.ani
@@ -0,0 +1,41 @@
+muzzle-med.0.png 0 1 0 -11
+muzzle-med.1.png 0 1 5 -12
+muzzle-med.2.png 0 1 9 -9
+muzzle-med.3.png 0 1 10 -5
+muzzle-med.4.png 0 1 12 0
+muzzle-med.5.png 0 1 10 5
+muzzle-med.6.png 0 1 9 10
+muzzle-med.7.png 0 1 6 12
+muzzle-med.8.png 0 1 0 12
+muzzle-med.9.png 0 1 -6 13
+muzzle-med.10.png 0 1 -9 10
+muzzle-med.11.png 0 1 -10 5
+muzzle-med.12.png 0 1 -12 0
+muzzle-med.13.png 0 1 -10 -6
+muzzle-med.14.png 0 1 -9 -9
+muzzle-med.15.png 0 1 -6 -12
+muzzle-med.16.png 0 1 1 10
+muzzle-med.17.png -1 1 -4 10
+muzzle-med.18.png 0 1 -5 8
+muzzle-med.19.png 0 1 -8 4
+muzzle-med.20.png 0 1 -9 1
+muzzle-med.21.png -1 1 -8 -3
+muzzle-med.22.png 0 1 -5 -6
+muzzle-med.23.png 0 1 -4 -8
+muzzle-med.24.png 0 1 1 -9
+muzzle-med.25.png -1 1 5 -8
+muzzle-med.26.png 0 1 8 -6
+muzzle-med.27.png 0 1 10 -3
+muzzle-med.28.png 0 1 11 1
+muzzle-med.29.png -1 1 10 4
+muzzle-med.30.png 0 1 8 8
+muzzle-med.31.png 0 1 5 10
+muzzle-med.32.png 0 1 3 4
+muzzle-med.33.png 0 1 3 4
+muzzle-med.34.png 0 1 5 5
+muzzle-med.35.png 0 1 5 5
+muzzle-med.36.png 0 1 6 5
+muzzle-med.37.png 0 1 6 4
+muzzle-med.38.png 0 1 6 4
+muzzle-med.39.png 0 1 5 3
+muzzle-med.40.png 0 1 5 0
diff --git a/sc2/content/base/ships/chmmr/muzsml.0.png b/sc2/content/base/ships/chmmr/muzzle-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.0.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.0.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.1.png b/sc2/content/base/ships/chmmr/muzzle-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.1.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.1.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.10.png b/sc2/content/base/ships/chmmr/muzzle-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.10.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.10.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.11.png b/sc2/content/base/ships/chmmr/muzzle-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.11.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.11.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.12.png b/sc2/content/base/ships/chmmr/muzzle-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.12.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.12.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.13.png b/sc2/content/base/ships/chmmr/muzzle-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.13.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.13.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.14.png b/sc2/content/base/ships/chmmr/muzzle-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.14.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.14.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.15.png b/sc2/content/base/ships/chmmr/muzzle-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.15.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.15.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.16.png b/sc2/content/base/ships/chmmr/muzzle-sml.16.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.16.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.16.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.17.png b/sc2/content/base/ships/chmmr/muzzle-sml.17.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.17.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.17.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.18.png b/sc2/content/base/ships/chmmr/muzzle-sml.18.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.18.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.18.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.19.png b/sc2/content/base/ships/chmmr/muzzle-sml.19.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.19.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.19.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.2.png b/sc2/content/base/ships/chmmr/muzzle-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.2.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.2.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.20.png b/sc2/content/base/ships/chmmr/muzzle-sml.20.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.20.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.20.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.21.png b/sc2/content/base/ships/chmmr/muzzle-sml.21.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.21.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.21.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.22.png b/sc2/content/base/ships/chmmr/muzzle-sml.22.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.22.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.22.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.23.png b/sc2/content/base/ships/chmmr/muzzle-sml.23.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.23.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.23.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.24.png b/sc2/content/base/ships/chmmr/muzzle-sml.24.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.24.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.24.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.25.png b/sc2/content/base/ships/chmmr/muzzle-sml.25.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.25.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.25.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.26.png b/sc2/content/base/ships/chmmr/muzzle-sml.26.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.26.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.26.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.27.png b/sc2/content/base/ships/chmmr/muzzle-sml.27.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.27.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.27.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.28.png b/sc2/content/base/ships/chmmr/muzzle-sml.28.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.28.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.28.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.29.png b/sc2/content/base/ships/chmmr/muzzle-sml.29.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.29.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.29.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.3.png b/sc2/content/base/ships/chmmr/muzzle-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.3.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.3.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.30.png b/sc2/content/base/ships/chmmr/muzzle-sml.30.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.30.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.30.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.31.png b/sc2/content/base/ships/chmmr/muzzle-sml.31.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.31.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.31.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.32.png b/sc2/content/base/ships/chmmr/muzzle-sml.32.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.32.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.32.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.33.png b/sc2/content/base/ships/chmmr/muzzle-sml.33.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.33.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.33.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.34.png b/sc2/content/base/ships/chmmr/muzzle-sml.34.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.34.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.34.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.35.png b/sc2/content/base/ships/chmmr/muzzle-sml.35.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.35.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.35.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.36.png b/sc2/content/base/ships/chmmr/muzzle-sml.36.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.36.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.36.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.37.png b/sc2/content/base/ships/chmmr/muzzle-sml.37.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.37.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.37.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.38.png b/sc2/content/base/ships/chmmr/muzzle-sml.38.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.38.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.38.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.39.png b/sc2/content/base/ships/chmmr/muzzle-sml.39.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.39.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.39.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.4.png b/sc2/content/base/ships/chmmr/muzzle-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.4.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.4.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.40.png b/sc2/content/base/ships/chmmr/muzzle-sml.40.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.40.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.40.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.5.png b/sc2/content/base/ships/chmmr/muzzle-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.5.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.5.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.6.png b/sc2/content/base/ships/chmmr/muzzle-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.6.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.6.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.7.png b/sc2/content/base/ships/chmmr/muzzle-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.7.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.7.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.8.png b/sc2/content/base/ships/chmmr/muzzle-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.8.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.8.png
diff --git a/sc2/content/base/ships/chmmr/muzsml.9.png b/sc2/content/base/ships/chmmr/muzzle-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/muzsml.9.png
rename to sc2/content/base/ships/chmmr/muzzle-sml.9.png
diff --git a/sc2/content/base/ships/chmmr/muzzle-sml.ani b/sc2/content/base/ships/chmmr/muzzle-sml.ani
new file mode 100644
index 000000000..b92046a21
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/muzzle-sml.ani
@@ -0,0 +1,41 @@
+muzzle-sml.0.png 0 1 0 -7
+muzzle-sml.1.png 0 1 3 -6
+muzzle-sml.2.png 0 1 5 -5
+muzzle-sml.3.png 0 1 6 -3
+muzzle-sml.4.png 0 1 7 0
+muzzle-sml.5.png 0 1 6 3
+muzzle-sml.6.png 0 1 5 5
+muzzle-sml.7.png 0 1 3 6
+muzzle-sml.8.png 0 1 0 7
+muzzle-sml.9.png 0 1 -3 6
+muzzle-sml.10.png 0 1 -5 -5
+muzzle-sml.11.png 0 1 -6 3
+muzzle-sml.12.png 0 1 -7 0
+muzzle-sml.13.png 0 1 -6 -3
+muzzle-sml.14.png 0 1 -5 -5
+muzzle-sml.15.png 0 1 -3 -6
+muzzle-sml.16.png -1 1 0 6
+muzzle-sml.17.png -1 1 -2 5
+muzzle-sml.18.png 0 1 -3 4
+muzzle-sml.19.png -1 1 -4 2
+muzzle-sml.20.png -1 1 -5 0
+muzzle-sml.21.png -1 1 -4 -2
+muzzle-sml.22.png 0 1 -3 -3
+muzzle-sml.23.png -1 1 -2 -4
+muzzle-sml.24.png -1 1 0 -5
+muzzle-sml.25.png -1 1 2 -4
+muzzle-sml.26.png 0 1 4 -3
+muzzle-sml.27.png -1 1 5 -2
+muzzle-sml.28.png -1 1 6 0
+muzzle-sml.29.png -1 1 5 2
+muzzle-sml.30.png 0 1 4 4
+muzzle-sml.31.png -1 1 2 5
+muzzle-sml.32.png 0 1 2 2
+muzzle-sml.33.png 0 1 2 2
+muzzle-sml.34.png 0 1 3 2
+muzzle-sml.35.png 0 1 3 3
+muzzle-sml.36.png 0 1 3 2
+muzzle-sml.37.png 0 1 4 2
+muzzle-sml.38.png 0 1 3 2
+muzzle-sml.39.png 0 1 3 1
+muzzle-sml.40.png 0 1 3 0
diff --git a/sc2/content/base/ships/chmmr/satbig.ani b/sc2/content/base/ships/chmmr/satbig.ani
deleted file mode 100644
index ee31becfc..000000000
--- a/sc2/content/base/ships/chmmr/satbig.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-satbig.0.png 0 1 9 7
-satbig.1.png 0 1 8 7
-satbig.2.png 0 1 5 7
-satbig.3.png 0 1 3 7
-satbig.4.png 0 1 3 7
-satbig.5.png 0 1 3 7
-satbig.6.png 0 1 5 7
-satbig.7.png 0 1 8 7
diff --git a/sc2/content/base/ships/chmmr/satbig.0.png b/sc2/content/base/ships/chmmr/satellite-big.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.0.png
rename to sc2/content/base/ships/chmmr/satellite-big.0.png
diff --git a/sc2/content/base/ships/chmmr/satbig.1.png b/sc2/content/base/ships/chmmr/satellite-big.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.1.png
rename to sc2/content/base/ships/chmmr/satellite-big.1.png
diff --git a/sc2/content/base/ships/chmmr/satbig.2.png b/sc2/content/base/ships/chmmr/satellite-big.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.2.png
rename to sc2/content/base/ships/chmmr/satellite-big.2.png
diff --git a/sc2/content/base/ships/chmmr/satbig.3.png b/sc2/content/base/ships/chmmr/satellite-big.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.3.png
rename to sc2/content/base/ships/chmmr/satellite-big.3.png
diff --git a/sc2/content/base/ships/chmmr/satbig.4.png b/sc2/content/base/ships/chmmr/satellite-big.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.4.png
rename to sc2/content/base/ships/chmmr/satellite-big.4.png
diff --git a/sc2/content/base/ships/chmmr/satbig.5.png b/sc2/content/base/ships/chmmr/satellite-big.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.5.png
rename to sc2/content/base/ships/chmmr/satellite-big.5.png
diff --git a/sc2/content/base/ships/chmmr/satbig.6.png b/sc2/content/base/ships/chmmr/satellite-big.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.6.png
rename to sc2/content/base/ships/chmmr/satellite-big.6.png
diff --git a/sc2/content/base/ships/chmmr/satbig.7.png b/sc2/content/base/ships/chmmr/satellite-big.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satbig.7.png
rename to sc2/content/base/ships/chmmr/satellite-big.7.png
diff --git a/sc2/content/base/ships/chmmr/satellite-big.ani b/sc2/content/base/ships/chmmr/satellite-big.ani
new file mode 100644
index 000000000..fc0ee740a
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/satellite-big.ani
@@ -0,0 +1,8 @@
+satellite-big.0.png 0 1 9 7
+satellite-big.1.png 0 1 8 7
+satellite-big.2.png 0 1 5 7
+satellite-big.3.png 0 1 3 7
+satellite-big.4.png 0 1 3 7
+satellite-big.5.png 0 1 3 7
+satellite-big.6.png 0 1 5 7
+satellite-big.7.png 0 1 8 7
diff --git a/sc2/content/base/ships/chmmr/satmed.0.png b/sc2/content/base/ships/chmmr/satellite-med.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.0.png
rename to sc2/content/base/ships/chmmr/satellite-med.0.png
diff --git a/sc2/content/base/ships/chmmr/satmed.1.png b/sc2/content/base/ships/chmmr/satellite-med.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.1.png
rename to sc2/content/base/ships/chmmr/satellite-med.1.png
diff --git a/sc2/content/base/ships/chmmr/satmed.2.png b/sc2/content/base/ships/chmmr/satellite-med.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.2.png
rename to sc2/content/base/ships/chmmr/satellite-med.2.png
diff --git a/sc2/content/base/ships/chmmr/satmed.3.png b/sc2/content/base/ships/chmmr/satellite-med.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.3.png
rename to sc2/content/base/ships/chmmr/satellite-med.3.png
diff --git a/sc2/content/base/ships/chmmr/satmed.4.png b/sc2/content/base/ships/chmmr/satellite-med.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.4.png
rename to sc2/content/base/ships/chmmr/satellite-med.4.png
diff --git a/sc2/content/base/ships/chmmr/satmed.5.png b/sc2/content/base/ships/chmmr/satellite-med.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.5.png
rename to sc2/content/base/ships/chmmr/satellite-med.5.png
diff --git a/sc2/content/base/ships/chmmr/satmed.6.png b/sc2/content/base/ships/chmmr/satellite-med.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.6.png
rename to sc2/content/base/ships/chmmr/satellite-med.6.png
diff --git a/sc2/content/base/ships/chmmr/satmed.7.png b/sc2/content/base/ships/chmmr/satellite-med.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satmed.7.png
rename to sc2/content/base/ships/chmmr/satellite-med.7.png
diff --git a/sc2/content/base/ships/chmmr/satellite-med.ani b/sc2/content/base/ships/chmmr/satellite-med.ani
new file mode 100644
index 000000000..56f5cb78f
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/satellite-med.ani
@@ -0,0 +1,8 @@
+satellite-med.0.png 0 1 4 3
+satellite-med.1.png 0 1 4 3
+satellite-med.2.png 0 1 3 3
+satellite-med.3.png 0 1 2 3
+satellite-med.4.png 0 1 1 3
+satellite-med.5.png 0 1 2 3
+satellite-med.6.png 0 1 3 3
+satellite-med.7.png 0 1 4 3
diff --git a/sc2/content/base/ships/chmmr/satsml.0.png b/sc2/content/base/ships/chmmr/satellite-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.0.png
rename to sc2/content/base/ships/chmmr/satellite-sml.0.png
diff --git a/sc2/content/base/ships/chmmr/satsml.1.png b/sc2/content/base/ships/chmmr/satellite-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.1.png
rename to sc2/content/base/ships/chmmr/satellite-sml.1.png
diff --git a/sc2/content/base/ships/chmmr/satsml.2.png b/sc2/content/base/ships/chmmr/satellite-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.2.png
rename to sc2/content/base/ships/chmmr/satellite-sml.2.png
diff --git a/sc2/content/base/ships/chmmr/satsml.3.png b/sc2/content/base/ships/chmmr/satellite-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.3.png
rename to sc2/content/base/ships/chmmr/satellite-sml.3.png
diff --git a/sc2/content/base/ships/chmmr/satsml.4.png b/sc2/content/base/ships/chmmr/satellite-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.4.png
rename to sc2/content/base/ships/chmmr/satellite-sml.4.png
diff --git a/sc2/content/base/ships/chmmr/satsml.5.png b/sc2/content/base/ships/chmmr/satellite-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.5.png
rename to sc2/content/base/ships/chmmr/satellite-sml.5.png
diff --git a/sc2/content/base/ships/chmmr/satsml.6.png b/sc2/content/base/ships/chmmr/satellite-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.6.png
rename to sc2/content/base/ships/chmmr/satellite-sml.6.png
diff --git a/sc2/content/base/ships/chmmr/satsml.7.png b/sc2/content/base/ships/chmmr/satellite-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/chmmr/satsml.7.png
rename to sc2/content/base/ships/chmmr/satellite-sml.7.png
diff --git a/sc2/content/base/ships/chmmr/satellite-sml.ani b/sc2/content/base/ships/chmmr/satellite-sml.ani
new file mode 100644
index 000000000..b0373aa47
--- /dev/null
+++ b/sc2/content/base/ships/chmmr/satellite-sml.ani
@@ -0,0 +1,8 @@
+satellite-sml.0.png 0 1 2 2
+satellite-sml.1.png 0 1 2 2
+satellite-sml.2.png 0 1 2 2
+satellite-sml.3.png 0 1 1 2
+satellite-sml.4.png 0 1 1 2
+satellite-sml.5.png 0 1 2 2
+satellite-sml.6.png 0 1 2 2
+satellite-sml.7.png 0 1 2 2
diff --git a/sc2/content/base/ships/chmmr/satmed.ani b/sc2/content/base/ships/chmmr/satmed.ani
deleted file mode 100644
index 7511f68b7..000000000
--- a/sc2/content/base/ships/chmmr/satmed.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-satmed.0.png 0 1 4 3
-satmed.1.png 0 1 4 3
-satmed.2.png 0 1 3 3
-satmed.3.png 0 1 2 3
-satmed.4.png 0 1 1 3
-satmed.5.png 0 1 2 3
-satmed.6.png 0 1 3 3
-satmed.7.png 0 1 4 3
diff --git a/sc2/content/base/ships/chmmr/satsml.ani b/sc2/content/base/ships/chmmr/satsml.ani
deleted file mode 100644
index 29398d7e5..000000000
--- a/sc2/content/base/ships/chmmr/satsml.ani
+++ /dev/null
@@ -1,8 +0,0 @@
-satsml.0.png 0 1 2 2
-satsml.1.png 0 1 2 2
-satsml.2.png 0 1 2 2
-satsml.3.png 0 1 1 2
-satsml.4.png 0 1 1 2
-satsml.5.png 0 1 2 2
-satsml.6.png 0 1 2 2
-satsml.7.png 0 1 2 2
diff --git a/sc2/content/base/ships/drone/promicon.0.png b/sc2/content/base/ships/drone/drone-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/drone/promicon.0.png
rename to sc2/content/base/ships/drone/drone-meleeicons.0.png
diff --git a/sc2/content/base/ships/drone/drone-meleeicons.ani b/sc2/content/base/ships/drone/drone-meleeicons.ani
new file mode 100644
index 000000000..ed9b1aab5
--- /dev/null
+++ b/sc2/content/base/ships/drone/drone-meleeicons.ani
@@ -0,0 +1 @@
+drone-meleeicons.0.png 0 0 3 4
diff --git a/sc2/content/base/ships/drone/promicon.ani b/sc2/content/base/ships/drone/promicon.ani
deleted file mode 100644
index 7fd15b77c..000000000
--- a/sc2/content/base/ships/drone/promicon.ani
+++ /dev/null
@@ -1 +0,0 @@
-promicon.0.png 0 0 3 4
diff --git a/sc2/content/base/ships/druuge/canbig.ani b/sc2/content/base/ships/druuge/canbig.ani
deleted file mode 100644
index 319904ece..000000000
--- a/sc2/content/base/ships/druuge/canbig.ani
+++ /dev/null
@@ -1,24 +0,0 @@
-canbig.0.png 0 1 1 5
-canbig.1.png 0 1 2 5
-canbig.2.png 0 1 2 4
-canbig.3.png 0 1 3 2
-canbig.4.png 0 1 3 1
-canbig.5.png 0 1 3 2
-canbig.6.png 0 1 2 2
-canbig.7.png 0 1 2 3
-canbig.8.png 0 1 1 3
-canbig.9.png 0 1 2 3
-canbig.10.png 0 1 4 2
-canbig.11.png 0 1 5 2
-canbig.12.png 0 1 5 1
-canbig.13.png 0 1 5 2
-canbig.14.png 0 1 4 4
-canbig.15.png 0 1 2 5
-canbig.16.png 0 1 2 2
-canbig.17.png 0 1 3 3
-canbig.18.png 0 1 4 4
-canbig.19.png 0 1 5 5
-canbig.20.png 0 1 5 5
-canbig.21.png 0 1 6 6
-canbig.22.png 0 1 7 7
-canbig.23.png 0 1 8 8
diff --git a/sc2/content/base/ships/druuge/canmed.ani b/sc2/content/base/ships/druuge/canmed.ani
deleted file mode 100644
index 439cd89de..000000000
--- a/sc2/content/base/ships/druuge/canmed.ani
+++ /dev/null
@@ -1,24 +0,0 @@
-canmed.0.png 0 1 1 3
-canmed.1.png 0 1 0 2
-canmed.2.png 0 1 1 1
-canmed.3.png 0 1 1 1
-canmed.4.png 0 1 1 1
-canmed.5.png 0 1 1 0
-canmed.6.png 0 1 1 1
-canmed.7.png 0 1 0 1
-canmed.8.png 0 1 1 1
-canmed.9.png 0 1 1 1
-canmed.10.png 0 1 2 1
-canmed.11.png 0 1 2 0
-canmed.12.png 0 1 3 1
-canmed.13.png 0 1 2 1
-canmed.14.png 0 1 2 2
-canmed.15.png 0 1 1 2
-canmed.16.png -1 1 1 1
-canmed.17.png 0 1 2 2
-canmed.18.png 0 1 2 2
-canmed.19.png 0 1 2 2
-canmed.20.png 0 1 2 2
-canmed.21.png 0 1 3 3
-canmed.22.png 0 1 4 3
-canmed.23.png 0 1 4 4
diff --git a/sc2/content/base/ships/druuge/canbig.0.png b/sc2/content/base/ships/druuge/cannon-big.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.0.png
rename to sc2/content/base/ships/druuge/cannon-big.0.png
diff --git a/sc2/content/base/ships/druuge/canbig.1.png b/sc2/content/base/ships/druuge/cannon-big.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.1.png
rename to sc2/content/base/ships/druuge/cannon-big.1.png
diff --git a/sc2/content/base/ships/druuge/canbig.10.png b/sc2/content/base/ships/druuge/cannon-big.10.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.10.png
rename to sc2/content/base/ships/druuge/cannon-big.10.png
diff --git a/sc2/content/base/ships/druuge/canbig.11.png b/sc2/content/base/ships/druuge/cannon-big.11.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.11.png
rename to sc2/content/base/ships/druuge/cannon-big.11.png
diff --git a/sc2/content/base/ships/druuge/canbig.12.png b/sc2/content/base/ships/druuge/cannon-big.12.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.12.png
rename to sc2/content/base/ships/druuge/cannon-big.12.png
diff --git a/sc2/content/base/ships/druuge/canbig.13.png b/sc2/content/base/ships/druuge/cannon-big.13.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.13.png
rename to sc2/content/base/ships/druuge/cannon-big.13.png
diff --git a/sc2/content/base/ships/druuge/canbig.14.png b/sc2/content/base/ships/druuge/cannon-big.14.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.14.png
rename to sc2/content/base/ships/druuge/cannon-big.14.png
diff --git a/sc2/content/base/ships/druuge/canbig.15.png b/sc2/content/base/ships/druuge/cannon-big.15.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.15.png
rename to sc2/content/base/ships/druuge/cannon-big.15.png
diff --git a/sc2/content/base/ships/druuge/canbig.16.png b/sc2/content/base/ships/druuge/cannon-big.16.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.16.png
rename to sc2/content/base/ships/druuge/cannon-big.16.png
diff --git a/sc2/content/base/ships/druuge/canbig.17.png b/sc2/content/base/ships/druuge/cannon-big.17.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.17.png
rename to sc2/content/base/ships/druuge/cannon-big.17.png
diff --git a/sc2/content/base/ships/druuge/canbig.18.png b/sc2/content/base/ships/druuge/cannon-big.18.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.18.png
rename to sc2/content/base/ships/druuge/cannon-big.18.png
diff --git a/sc2/content/base/ships/druuge/canbig.19.png b/sc2/content/base/ships/druuge/cannon-big.19.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.19.png
rename to sc2/content/base/ships/druuge/cannon-big.19.png
diff --git a/sc2/content/base/ships/druuge/canbig.2.png b/sc2/content/base/ships/druuge/cannon-big.2.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.2.png
rename to sc2/content/base/ships/druuge/cannon-big.2.png
diff --git a/sc2/content/base/ships/druuge/canbig.20.png b/sc2/content/base/ships/druuge/cannon-big.20.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.20.png
rename to sc2/content/base/ships/druuge/cannon-big.20.png
diff --git a/sc2/content/base/ships/druuge/canbig.21.png b/sc2/content/base/ships/druuge/cannon-big.21.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.21.png
rename to sc2/content/base/ships/druuge/cannon-big.21.png
diff --git a/sc2/content/base/ships/druuge/canbig.22.png b/sc2/content/base/ships/druuge/cannon-big.22.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.22.png
rename to sc2/content/base/ships/druuge/cannon-big.22.png
diff --git a/sc2/content/base/ships/druuge/canbig.23.png b/sc2/content/base/ships/druuge/cannon-big.23.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.23.png
rename to sc2/content/base/ships/druuge/cannon-big.23.png
diff --git a/sc2/content/base/ships/druuge/canbig.3.png b/sc2/content/base/ships/druuge/cannon-big.3.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.3.png
rename to sc2/content/base/ships/druuge/cannon-big.3.png
diff --git a/sc2/content/base/ships/druuge/canbig.4.png b/sc2/content/base/ships/druuge/cannon-big.4.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.4.png
rename to sc2/content/base/ships/druuge/cannon-big.4.png
diff --git a/sc2/content/base/ships/druuge/canbig.5.png b/sc2/content/base/ships/druuge/cannon-big.5.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.5.png
rename to sc2/content/base/ships/druuge/cannon-big.5.png
diff --git a/sc2/content/base/ships/druuge/canbig.6.png b/sc2/content/base/ships/druuge/cannon-big.6.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.6.png
rename to sc2/content/base/ships/druuge/cannon-big.6.png
diff --git a/sc2/content/base/ships/druuge/canbig.7.png b/sc2/content/base/ships/druuge/cannon-big.7.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.7.png
rename to sc2/content/base/ships/druuge/cannon-big.7.png
diff --git a/sc2/content/base/ships/druuge/canbig.8.png b/sc2/content/base/ships/druuge/cannon-big.8.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.8.png
rename to sc2/content/base/ships/druuge/cannon-big.8.png
diff --git a/sc2/content/base/ships/druuge/canbig.9.png b/sc2/content/base/ships/druuge/cannon-big.9.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canbig.9.png
rename to sc2/content/base/ships/druuge/cannon-big.9.png
diff --git a/sc2/content/base/ships/druuge/cannon-big.ani b/sc2/content/base/ships/druuge/cannon-big.ani
new file mode 100644
index 000000000..46df1aba3
--- /dev/null
+++ b/sc2/content/base/ships/druuge/cannon-big.ani
@@ -0,0 +1,24 @@
+cannon-big.0.png 0 1 1 5
+cannon-big.1.png 0 1 2 5
+cannon-big.2.png 0 1 2 4
+cannon-big.3.png 0 1 3 2
+cannon-big.4.png 0 1 3 1
+cannon-big.5.png 0 1 3 2
+cannon-big.6.png 0 1 2 2
+cannon-big.7.png 0 1 2 3
+cannon-big.8.png 0 1 1 3
+cannon-big.9.png 0 1 2 3
+cannon-big.10.png 0 1 4 2
+cannon-big.11.png 0 1 5 2
+cannon-big.12.png 0 1 5 1
+cannon-big.13.png 0 1 5 2
+cannon-big.14.png 0 1 4 4
+cannon-big.15.png 0 1 2 5
+cannon-big.16.png 0 1 2 2
+cannon-big.17.png 0 1 3 3
+cannon-big.18.png 0 1 4 4
+cannon-big.19.png 0 1 5 5
+cannon-big.20.png 0 1 5 5
+cannon-big.21.png 0 1 6 6
+cannon-big.22.png 0 1 7 7
+cannon-big.23.png 0 1 8 8
diff --git a/sc2/content/base/ships/druuge/canmed.0.png b/sc2/content/base/ships/druuge/cannon-med.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.0.png
rename to sc2/content/base/ships/druuge/cannon-med.0.png
diff --git a/sc2/content/base/ships/druuge/canmed.1.png b/sc2/content/base/ships/druuge/cannon-med.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.1.png
rename to sc2/content/base/ships/druuge/cannon-med.1.png
diff --git a/sc2/content/base/ships/druuge/canmed.10.png b/sc2/content/base/ships/druuge/cannon-med.10.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.10.png
rename to sc2/content/base/ships/druuge/cannon-med.10.png
diff --git a/sc2/content/base/ships/druuge/canmed.11.png b/sc2/content/base/ships/druuge/cannon-med.11.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.11.png
rename to sc2/content/base/ships/druuge/cannon-med.11.png
diff --git a/sc2/content/base/ships/druuge/canmed.12.png b/sc2/content/base/ships/druuge/cannon-med.12.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.12.png
rename to sc2/content/base/ships/druuge/cannon-med.12.png
diff --git a/sc2/content/base/ships/druuge/canmed.13.png b/sc2/content/base/ships/druuge/cannon-med.13.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.13.png
rename to sc2/content/base/ships/druuge/cannon-med.13.png
diff --git a/sc2/content/base/ships/druuge/canmed.14.png b/sc2/content/base/ships/druuge/cannon-med.14.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.14.png
rename to sc2/content/base/ships/druuge/cannon-med.14.png
diff --git a/sc2/content/base/ships/druuge/canmed.15.png b/sc2/content/base/ships/druuge/cannon-med.15.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.15.png
rename to sc2/content/base/ships/druuge/cannon-med.15.png
diff --git a/sc2/content/base/ships/druuge/canmed.16.png b/sc2/content/base/ships/druuge/cannon-med.16.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.16.png
rename to sc2/content/base/ships/druuge/cannon-med.16.png
diff --git a/sc2/content/base/ships/druuge/canmed.17.png b/sc2/content/base/ships/druuge/cannon-med.17.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.17.png
rename to sc2/content/base/ships/druuge/cannon-med.17.png
diff --git a/sc2/content/base/ships/druuge/canmed.18.png b/sc2/content/base/ships/druuge/cannon-med.18.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.18.png
rename to sc2/content/base/ships/druuge/cannon-med.18.png
diff --git a/sc2/content/base/ships/druuge/canmed.19.png b/sc2/content/base/ships/druuge/cannon-med.19.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.19.png
rename to sc2/content/base/ships/druuge/cannon-med.19.png
diff --git a/sc2/content/base/ships/druuge/canmed.2.png b/sc2/content/base/ships/druuge/cannon-med.2.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.2.png
rename to sc2/content/base/ships/druuge/cannon-med.2.png
diff --git a/sc2/content/base/ships/druuge/canmed.20.png b/sc2/content/base/ships/druuge/cannon-med.20.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.20.png
rename to sc2/content/base/ships/druuge/cannon-med.20.png
diff --git a/sc2/content/base/ships/druuge/canmed.21.png b/sc2/content/base/ships/druuge/cannon-med.21.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.21.png
rename to sc2/content/base/ships/druuge/cannon-med.21.png
diff --git a/sc2/content/base/ships/druuge/canmed.22.png b/sc2/content/base/ships/druuge/cannon-med.22.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.22.png
rename to sc2/content/base/ships/druuge/cannon-med.22.png
diff --git a/sc2/content/base/ships/druuge/canmed.23.png b/sc2/content/base/ships/druuge/cannon-med.23.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.23.png
rename to sc2/content/base/ships/druuge/cannon-med.23.png
diff --git a/sc2/content/base/ships/druuge/canmed.3.png b/sc2/content/base/ships/druuge/cannon-med.3.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.3.png
rename to sc2/content/base/ships/druuge/cannon-med.3.png
diff --git a/sc2/content/base/ships/druuge/canmed.4.png b/sc2/content/base/ships/druuge/cannon-med.4.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.4.png
rename to sc2/content/base/ships/druuge/cannon-med.4.png
diff --git a/sc2/content/base/ships/druuge/canmed.5.png b/sc2/content/base/ships/druuge/cannon-med.5.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.5.png
rename to sc2/content/base/ships/druuge/cannon-med.5.png
diff --git a/sc2/content/base/ships/druuge/canmed.6.png b/sc2/content/base/ships/druuge/cannon-med.6.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.6.png
rename to sc2/content/base/ships/druuge/cannon-med.6.png
diff --git a/sc2/content/base/ships/druuge/canmed.7.png b/sc2/content/base/ships/druuge/cannon-med.7.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.7.png
rename to sc2/content/base/ships/druuge/cannon-med.7.png
diff --git a/sc2/content/base/ships/druuge/canmed.8.png b/sc2/content/base/ships/druuge/cannon-med.8.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.8.png
rename to sc2/content/base/ships/druuge/cannon-med.8.png
diff --git a/sc2/content/base/ships/druuge/canmed.9.png b/sc2/content/base/ships/druuge/cannon-med.9.png
similarity index 100%
rename from sc2/content/base/ships/druuge/canmed.9.png
rename to sc2/content/base/ships/druuge/cannon-med.9.png
diff --git a/sc2/content/base/ships/druuge/cannon-med.ani b/sc2/content/base/ships/druuge/cannon-med.ani
new file mode 100644
index 000000000..1bc16f3a1
--- /dev/null
+++ b/sc2/content/base/ships/druuge/cannon-med.ani
@@ -0,0 +1,24 @@
+cannon-med.0.png 0 1 1 3
+cannon-med.1.png 0 1 0 2
+cannon-med.2.png 0 1 1 1
+cannon-med.3.png 0 1 1 1
+cannon-med.4.png 0 1 1 1
+cannon-med.5.png 0 1 1 0
+cannon-med.6.png 0 1 1 1
+cannon-med.7.png 0 1 0 1
+cannon-med.8.png 0 1 1 1
+cannon-med.9.png 0 1 1 1
+cannon-med.10.png 0 1 2 1
+cannon-med.11.png 0 1 2 0
+cannon-med.12.png 0 1 3 1
+cannon-med.13.png 0 1 2 1
+cannon-med.14.png 0 1 2 2
+cannon-med.15.png 0 1 1 2
+cannon-med.16.png -1 1 1 1
+cannon-med.17.png 0 1 2 2
+cannon-med.18.png 0 1 2 2
+cannon-med.19.png 0 1 2 2
+cannon-med.20.png 0 1 2 2
+cannon-med.21.png 0 1 3 3
+cannon-med.22.png 0 1 4 3
+cannon-med.23.png 0 1 4 4
diff --git a/sc2/content/base/ships/druuge/cansml.0.png b/sc2/content/base/ships/druuge/cannon-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.0.png
rename to sc2/content/base/ships/druuge/cannon-sml.0.png
diff --git a/sc2/content/base/ships/druuge/cansml.1.png b/sc2/content/base/ships/druuge/cannon-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.1.png
rename to sc2/content/base/ships/druuge/cannon-sml.1.png
diff --git a/sc2/content/base/ships/druuge/cansml.10.png b/sc2/content/base/ships/druuge/cannon-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.10.png
rename to sc2/content/base/ships/druuge/cannon-sml.10.png
diff --git a/sc2/content/base/ships/druuge/cansml.11.png b/sc2/content/base/ships/druuge/cannon-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.11.png
rename to sc2/content/base/ships/druuge/cannon-sml.11.png
diff --git a/sc2/content/base/ships/druuge/cansml.12.png b/sc2/content/base/ships/druuge/cannon-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.12.png
rename to sc2/content/base/ships/druuge/cannon-sml.12.png
diff --git a/sc2/content/base/ships/druuge/cansml.13.png b/sc2/content/base/ships/druuge/cannon-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.13.png
rename to sc2/content/base/ships/druuge/cannon-sml.13.png
diff --git a/sc2/content/base/ships/druuge/cansml.14.png b/sc2/content/base/ships/druuge/cannon-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.14.png
rename to sc2/content/base/ships/druuge/cannon-sml.14.png
diff --git a/sc2/content/base/ships/druuge/cansml.15.png b/sc2/content/base/ships/druuge/cannon-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.15.png
rename to sc2/content/base/ships/druuge/cannon-sml.15.png
diff --git a/sc2/content/base/ships/druuge/cansml.16.png b/sc2/content/base/ships/druuge/cannon-sml.16.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.16.png
rename to sc2/content/base/ships/druuge/cannon-sml.16.png
diff --git a/sc2/content/base/ships/druuge/cansml.17.png b/sc2/content/base/ships/druuge/cannon-sml.17.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.17.png
rename to sc2/content/base/ships/druuge/cannon-sml.17.png
diff --git a/sc2/content/base/ships/druuge/cansml.18.png b/sc2/content/base/ships/druuge/cannon-sml.18.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.18.png
rename to sc2/content/base/ships/druuge/cannon-sml.18.png
diff --git a/sc2/content/base/ships/druuge/cansml.19.png b/sc2/content/base/ships/druuge/cannon-sml.19.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.19.png
rename to sc2/content/base/ships/druuge/cannon-sml.19.png
diff --git a/sc2/content/base/ships/druuge/cansml.2.png b/sc2/content/base/ships/druuge/cannon-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.2.png
rename to sc2/content/base/ships/druuge/cannon-sml.2.png
diff --git a/sc2/content/base/ships/druuge/cansml.20.png b/sc2/content/base/ships/druuge/cannon-sml.20.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.20.png
rename to sc2/content/base/ships/druuge/cannon-sml.20.png
diff --git a/sc2/content/base/ships/druuge/cansml.21.png b/sc2/content/base/ships/druuge/cannon-sml.21.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.21.png
rename to sc2/content/base/ships/druuge/cannon-sml.21.png
diff --git a/sc2/content/base/ships/druuge/cansml.22.png b/sc2/content/base/ships/druuge/cannon-sml.22.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.22.png
rename to sc2/content/base/ships/druuge/cannon-sml.22.png
diff --git a/sc2/content/base/ships/druuge/cansml.23.png b/sc2/content/base/ships/druuge/cannon-sml.23.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.23.png
rename to sc2/content/base/ships/druuge/cannon-sml.23.png
diff --git a/sc2/content/base/ships/druuge/cansml.3.png b/sc2/content/base/ships/druuge/cannon-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.3.png
rename to sc2/content/base/ships/druuge/cannon-sml.3.png
diff --git a/sc2/content/base/ships/druuge/cansml.4.png b/sc2/content/base/ships/druuge/cannon-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.4.png
rename to sc2/content/base/ships/druuge/cannon-sml.4.png
diff --git a/sc2/content/base/ships/druuge/cansml.5.png b/sc2/content/base/ships/druuge/cannon-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.5.png
rename to sc2/content/base/ships/druuge/cannon-sml.5.png
diff --git a/sc2/content/base/ships/druuge/cansml.6.png b/sc2/content/base/ships/druuge/cannon-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.6.png
rename to sc2/content/base/ships/druuge/cannon-sml.6.png
diff --git a/sc2/content/base/ships/druuge/cansml.7.png b/sc2/content/base/ships/druuge/cannon-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.7.png
rename to sc2/content/base/ships/druuge/cannon-sml.7.png
diff --git a/sc2/content/base/ships/druuge/cansml.8.png b/sc2/content/base/ships/druuge/cannon-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.8.png
rename to sc2/content/base/ships/druuge/cannon-sml.8.png
diff --git a/sc2/content/base/ships/druuge/cansml.9.png b/sc2/content/base/ships/druuge/cannon-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/druuge/cansml.9.png
rename to sc2/content/base/ships/druuge/cannon-sml.9.png
diff --git a/sc2/content/base/ships/druuge/cannon-sml.ani b/sc2/content/base/ships/druuge/cannon-sml.ani
new file mode 100644
index 000000000..7b09ce9a7
--- /dev/null
+++ b/sc2/content/base/ships/druuge/cannon-sml.ani
@@ -0,0 +1,24 @@
+cannon-sml.0.png -1 1 0 1
+cannon-sml.1.png 0 1 0 1
+cannon-sml.2.png -1 1 0 1
+cannon-sml.3.png 0 1 1 1
+cannon-sml.4.png -1 1 1 0
+cannon-sml.5.png 0 1 1 1
+cannon-sml.6.png -1 1 0 0
+cannon-sml.7.png 0 1 0 1
+cannon-sml.8.png -1 1 0 1
+cannon-sml.9.png 0 1 0 1
+cannon-sml.10.png -1 1 1 1
+cannon-sml.11.png 0 1 1 1
+cannon-sml.12.png -1 1 1 0
+cannon-sml.13.png 0 1 1 0
+cannon-sml.14.png -1 1 1 1
+cannon-sml.15.png 0 1 0 1
+cannon-sml.16.png -1 1 0 0
+cannon-sml.17.png 0 1 1 1
+cannon-sml.18.png -1 1 1 1
+cannon-sml.19.png -1 1 1 1
+cannon-sml.20.png -1 1 1 1
+cannon-sml.21.png 0 1 1 1
+cannon-sml.22.png 0 1 1 1
+cannon-sml.23.png 0 1 2 2
diff --git a/sc2/content/base/ships/druuge/cansml.ani b/sc2/content/base/ships/druuge/cansml.ani
deleted file mode 100644
index 99b5a0a0a..000000000
--- a/sc2/content/base/ships/druuge/cansml.ani
+++ /dev/null
@@ -1,24 +0,0 @@
-cansml.0.png -1 1 0 1
-cansml.1.png 0 1 0 1
-cansml.2.png -1 1 0 1
-cansml.3.png 0 1 1 1
-cansml.4.png -1 1 1 0
-cansml.5.png 0 1 1 1
-cansml.6.png -1 1 0 0
-cansml.7.png 0 1 0 1
-cansml.8.png -1 1 0 1
-cansml.9.png 0 1 0 1
-cansml.10.png -1 1 1 1
-cansml.11.png 0 1 1 1
-cansml.12.png -1 1 1 0
-cansml.13.png 0 1 1 0
-cansml.14.png -1 1 1 1
-cansml.15.png 0 1 0 1
-cansml.16.png -1 1 0 0
-cansml.17.png 0 1 1 1
-cansml.18.png -1 1 1 1
-cansml.19.png -1 1 1 1
-cansml.20.png -1 1 1 1
-cansml.21.png 0 1 1 1
-cansml.22.png 0 1 1 1
-cansml.23.png 0 1 2 2
diff --git a/sc2/content/base/ships/druuge/drucap.ani b/sc2/content/base/ships/druuge/drucap.ani
deleted file mode 100644
index 83608508f..000000000
--- a/sc2/content/base/ships/druuge/drucap.ani
+++ /dev/null
@@ -1,15 +0,0 @@
-drucap.0.png -1 1 0 0
-drucap.1.png -1 1 -28 -14
-drucap.2.png -1 1 -28 -14
-drucap.3.png -1 1 -28 -14
-drucap.4.png -1 1 -28 -14
-drucap.5.png -1 1 -28 -14
-drucap.6.png 1 1 -41 0
-drucap.7.png 1 1 -41 0
-drucap.8.png 1 1 -41 0
-drucap.9.png -1 1 -32 -6
-drucap.10.png -1 1 -32 -6
-drucap.11.png -1 1 -32 -6
-drucap.12.png 1 1 0 0
-drucap.13.png 1 1 0 0
-drucap.14.png 1 1 0 0
diff --git a/sc2/content/base/ships/druuge/druicons.ani b/sc2/content/base/ships/druuge/druicons.ani
deleted file mode 100644
index 0ea4dcb19..000000000
--- a/sc2/content/base/ships/druuge/druicons.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-druicons.0.png 0 1 -1 -1
-druicons.1.png 0 1 7 21
diff --git a/sc2/content/base/ships/druuge/drumicon.ani b/sc2/content/base/ships/druuge/drumicon.ani
deleted file mode 100644
index 7232eb147..000000000
--- a/sc2/content/base/ships/druuge/drumicon.ani
+++ /dev/null
@@ -1,2 +0,0 @@
-drumicon.0.png 0 1 14 14
-drumicon.1.png 0 1 3 3
diff --git a/sc2/content/base/ships/druuge/druuge.big b/sc2/content/base/ships/druuge/druuge.big
deleted file mode 100644
index b41d57d05..000000000
--- a/sc2/content/base/ships/druuge/druuge.big
+++ /dev/null
@@ -1,16 +0,0 @@
-druuge.big.0.png 0 1 5 22
-druuge.big.1.png 0 1 8 20
-druuge.big.2.png 0 1 9 18
-druuge.big.3.png 0 1 10 13
-druuge.big.4.png 0 1 10 5
-druuge.big.5.png 0 1 10 8
-druuge.big.6.png 0 1 9 9
-druuge.big.7.png 0 1 8 10
-druuge.big.8.png 0 1 8 10
-druuge.big.9.png 0 1 12 10
-druuge.big.10.png 0 1 18 9
-druuge.big.11.png 0 1 22 8
-druuge.big.12.png 0 1 25 8
-druuge.big.13.png 0 1 22 13
-druuge.big.14.png 0 1 18 18
-druuge.big.15.png 0 1 12 20
diff --git a/sc2/content/base/ships/druuge/druuge.med b/sc2/content/base/ships/druuge/druuge.med
deleted file mode 100644
index f91f1b650..000000000
--- a/sc2/content/base/ships/druuge/druuge.med
+++ /dev/null
@@ -1,16 +0,0 @@
-druuge.med.0.png 0 1 3 11
-druuge.med.1.png 0 1 4 10
-druuge.med.2.png 0 1 5 8
-druuge.med.3.png 0 1 5 6
-druuge.med.4.png 0 1 5 2
-druuge.med.5.png 0 1 5 4
-druuge.med.6.png 0 1 5 4
-druuge.med.7.png 0 1 4 5
-druuge.med.8.png 0 1 4 5
-druuge.med.9.png 0 1 6 5
-druuge.med.10.png 0 1 9 4
-druuge.med.11.png 0 1 11 4
-druuge.med.12.png 0 1 13 4
-druuge.med.13.png 0 1 11 6
-druuge.med.14.png 0 1 9 8
-druuge.med.15.png 0 1 6 10
diff --git a/sc2/content/base/ships/druuge/druuge.sml b/sc2/content/base/ships/druuge/druuge.sml
deleted file mode 100644
index 6b9b6eaa2..000000000
--- a/sc2/content/base/ships/druuge/druuge.sml
+++ /dev/null
@@ -1,16 +0,0 @@
-druuge.sml.0.png 0 1 1 5
-druuge.sml.1.png 0 1 2 4
-druuge.sml.2.png 0 1 2 4
-druuge.sml.3.png 0 1 2 2
-druuge.sml.4.png 0 1 2 1
-druuge.sml.5.png 0 1 2 1
-druuge.sml.6.png 0 1 2 2
-druuge.sml.7.png 0 1 2 2
-druuge.sml.8.png 0 1 2 2
-druuge.sml.9.png 0 1 2 2
-druuge.sml.10.png 0 1 4 2
-druuge.sml.11.png 0 1 5 1
-druuge.sml.12.png 0 1 6 1
-druuge.sml.13.png 0 1 5 2
-druuge.sml.14.png 0 1 4 4
-druuge.sml.15.png 0 1 3 4
diff --git a/sc2/content/base/ships/druuge/druuge.big.0.png b/sc2/content/base/ships/druuge/mauler-big.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.0.png
rename to sc2/content/base/ships/druuge/mauler-big.0.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.1.png b/sc2/content/base/ships/druuge/mauler-big.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.1.png
rename to sc2/content/base/ships/druuge/mauler-big.1.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.10.png b/sc2/content/base/ships/druuge/mauler-big.10.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.10.png
rename to sc2/content/base/ships/druuge/mauler-big.10.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.11.png b/sc2/content/base/ships/druuge/mauler-big.11.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.11.png
rename to sc2/content/base/ships/druuge/mauler-big.11.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.12.png b/sc2/content/base/ships/druuge/mauler-big.12.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.12.png
rename to sc2/content/base/ships/druuge/mauler-big.12.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.13.png b/sc2/content/base/ships/druuge/mauler-big.13.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.13.png
rename to sc2/content/base/ships/druuge/mauler-big.13.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.14.png b/sc2/content/base/ships/druuge/mauler-big.14.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.14.png
rename to sc2/content/base/ships/druuge/mauler-big.14.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.15.png b/sc2/content/base/ships/druuge/mauler-big.15.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.15.png
rename to sc2/content/base/ships/druuge/mauler-big.15.png
diff --git a/sc2/content/base/ships/druuge/drumicon.0.png b/sc2/content/base/ships/druuge/mauler-big.2.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drumicon.0.png
rename to sc2/content/base/ships/druuge/mauler-big.2.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.3.png b/sc2/content/base/ships/druuge/mauler-big.3.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.3.png
rename to sc2/content/base/ships/druuge/mauler-big.3.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.4.png b/sc2/content/base/ships/druuge/mauler-big.4.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.4.png
rename to sc2/content/base/ships/druuge/mauler-big.4.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.5.png b/sc2/content/base/ships/druuge/mauler-big.5.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.5.png
rename to sc2/content/base/ships/druuge/mauler-big.5.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.6.png b/sc2/content/base/ships/druuge/mauler-big.6.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.6.png
rename to sc2/content/base/ships/druuge/mauler-big.6.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.7.png b/sc2/content/base/ships/druuge/mauler-big.7.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.7.png
rename to sc2/content/base/ships/druuge/mauler-big.7.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.8.png b/sc2/content/base/ships/druuge/mauler-big.8.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.8.png
rename to sc2/content/base/ships/druuge/mauler-big.8.png
diff --git a/sc2/content/base/ships/druuge/druuge.big.9.png b/sc2/content/base/ships/druuge/mauler-big.9.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.9.png
rename to sc2/content/base/ships/druuge/mauler-big.9.png
diff --git a/sc2/content/base/ships/druuge/mauler-big.ani b/sc2/content/base/ships/druuge/mauler-big.ani
new file mode 100644
index 000000000..5a7bdae87
--- /dev/null
+++ b/sc2/content/base/ships/druuge/mauler-big.ani
@@ -0,0 +1,16 @@
+mauler-big.0.png 0 1 5 22
+mauler-big.1.png 0 1 8 20
+mauler-big.2.png 0 1 9 18
+mauler-big.3.png 0 1 10 13
+mauler-big.4.png 0 1 10 5
+mauler-big.5.png 0 1 10 8
+mauler-big.6.png 0 1 9 9
+mauler-big.7.png 0 1 8 10
+mauler-big.8.png 0 1 8 10
+mauler-big.9.png 0 1 12 10
+mauler-big.10.png 0 1 18 9
+mauler-big.11.png 0 1 22 8
+mauler-big.12.png 0 1 25 8
+mauler-big.13.png 0 1 22 13
+mauler-big.14.png 0 1 18 18
+mauler-big.15.png 0 1 12 20
diff --git a/sc2/content/base/ships/druuge/drucap.0.png b/sc2/content/base/ships/druuge/mauler-cap.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.0.png
rename to sc2/content/base/ships/druuge/mauler-cap.0.png
diff --git a/sc2/content/base/ships/druuge/drucap.1.png b/sc2/content/base/ships/druuge/mauler-cap.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.1.png
rename to sc2/content/base/ships/druuge/mauler-cap.1.png
diff --git a/sc2/content/base/ships/druuge/drucap.10.png b/sc2/content/base/ships/druuge/mauler-cap.10.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.10.png
rename to sc2/content/base/ships/druuge/mauler-cap.10.png
diff --git a/sc2/content/base/ships/druuge/drucap.11.png b/sc2/content/base/ships/druuge/mauler-cap.11.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.11.png
rename to sc2/content/base/ships/druuge/mauler-cap.11.png
diff --git a/sc2/content/base/ships/druuge/drucap.12.png b/sc2/content/base/ships/druuge/mauler-cap.12.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.12.png
rename to sc2/content/base/ships/druuge/mauler-cap.12.png
diff --git a/sc2/content/base/ships/druuge/drucap.13.png b/sc2/content/base/ships/druuge/mauler-cap.13.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.13.png
rename to sc2/content/base/ships/druuge/mauler-cap.13.png
diff --git a/sc2/content/base/ships/druuge/drucap.14.png b/sc2/content/base/ships/druuge/mauler-cap.14.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.14.png
rename to sc2/content/base/ships/druuge/mauler-cap.14.png
diff --git a/sc2/content/base/ships/druuge/drucap.2.png b/sc2/content/base/ships/druuge/mauler-cap.2.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.2.png
rename to sc2/content/base/ships/druuge/mauler-cap.2.png
diff --git a/sc2/content/base/ships/druuge/drucap.3.png b/sc2/content/base/ships/druuge/mauler-cap.3.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.3.png
rename to sc2/content/base/ships/druuge/mauler-cap.3.png
diff --git a/sc2/content/base/ships/druuge/drucap.4.png b/sc2/content/base/ships/druuge/mauler-cap.4.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.4.png
rename to sc2/content/base/ships/druuge/mauler-cap.4.png
diff --git a/sc2/content/base/ships/druuge/drucap.5.png b/sc2/content/base/ships/druuge/mauler-cap.5.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.5.png
rename to sc2/content/base/ships/druuge/mauler-cap.5.png
diff --git a/sc2/content/base/ships/druuge/drucap.6.png b/sc2/content/base/ships/druuge/mauler-cap.6.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.6.png
rename to sc2/content/base/ships/druuge/mauler-cap.6.png
diff --git a/sc2/content/base/ships/druuge/drucap.7.png b/sc2/content/base/ships/druuge/mauler-cap.7.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.7.png
rename to sc2/content/base/ships/druuge/mauler-cap.7.png
diff --git a/sc2/content/base/ships/druuge/drucap.8.png b/sc2/content/base/ships/druuge/mauler-cap.8.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.8.png
rename to sc2/content/base/ships/druuge/mauler-cap.8.png
diff --git a/sc2/content/base/ships/druuge/drucap.9.png b/sc2/content/base/ships/druuge/mauler-cap.9.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drucap.9.png
rename to sc2/content/base/ships/druuge/mauler-cap.9.png
diff --git a/sc2/content/base/ships/druuge/mauler-cap.ani b/sc2/content/base/ships/druuge/mauler-cap.ani
new file mode 100644
index 000000000..3029fa80a
--- /dev/null
+++ b/sc2/content/base/ships/druuge/mauler-cap.ani
@@ -0,0 +1,15 @@
+mauler-cap.0.png -1 1 0 0
+mauler-cap.1.png -1 1 -28 -14
+mauler-cap.2.png -1 1 -28 -14
+mauler-cap.3.png -1 1 -28 -14
+mauler-cap.4.png -1 1 -28 -14
+mauler-cap.5.png -1 1 -28 -14
+mauler-cap.6.png 1 1 -41 0
+mauler-cap.7.png 1 1 -41 0
+mauler-cap.8.png 1 1 -41 0
+mauler-cap.9.png -1 1 -32 -6
+mauler-cap.10.png -1 1 -32 -6
+mauler-cap.11.png -1 1 -32 -6
+mauler-cap.12.png 1 1 0 0
+mauler-cap.13.png 1 1 0 0
+mauler-cap.14.png 1 1 0 0
diff --git a/sc2/content/base/ships/druuge/druicons.0.png b/sc2/content/base/ships/druuge/mauler-icons.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druicons.0.png
rename to sc2/content/base/ships/druuge/mauler-icons.0.png
diff --git a/sc2/content/base/ships/druuge/druicons.1.png b/sc2/content/base/ships/druuge/mauler-icons.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druicons.1.png
rename to sc2/content/base/ships/druuge/mauler-icons.1.png
diff --git a/sc2/content/base/ships/druuge/mauler-icons.ani b/sc2/content/base/ships/druuge/mauler-icons.ani
new file mode 100644
index 000000000..b0e953e51
--- /dev/null
+++ b/sc2/content/base/ships/druuge/mauler-icons.ani
@@ -0,0 +1,2 @@
+mauler-icons.0.png 0 1 -1 -1
+mauler-icons.1.png 0 1 7 21
diff --git a/sc2/content/base/ships/druuge/druuge.med.0.png b/sc2/content/base/ships/druuge/mauler-med.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.0.png
rename to sc2/content/base/ships/druuge/mauler-med.0.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.1.png b/sc2/content/base/ships/druuge/mauler-med.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.1.png
rename to sc2/content/base/ships/druuge/mauler-med.1.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.10.png b/sc2/content/base/ships/druuge/mauler-med.10.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.10.png
rename to sc2/content/base/ships/druuge/mauler-med.10.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.11.png b/sc2/content/base/ships/druuge/mauler-med.11.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.11.png
rename to sc2/content/base/ships/druuge/mauler-med.11.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.12.png b/sc2/content/base/ships/druuge/mauler-med.12.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.12.png
rename to sc2/content/base/ships/druuge/mauler-med.12.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.13.png b/sc2/content/base/ships/druuge/mauler-med.13.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.13.png
rename to sc2/content/base/ships/druuge/mauler-med.13.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.14.png b/sc2/content/base/ships/druuge/mauler-med.14.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.14.png
rename to sc2/content/base/ships/druuge/mauler-med.14.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.15.png b/sc2/content/base/ships/druuge/mauler-med.15.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.15.png
rename to sc2/content/base/ships/druuge/mauler-med.15.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.2.png b/sc2/content/base/ships/druuge/mauler-med.2.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.2.png
rename to sc2/content/base/ships/druuge/mauler-med.2.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.3.png b/sc2/content/base/ships/druuge/mauler-med.3.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.3.png
rename to sc2/content/base/ships/druuge/mauler-med.3.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.4.png b/sc2/content/base/ships/druuge/mauler-med.4.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.4.png
rename to sc2/content/base/ships/druuge/mauler-med.4.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.5.png b/sc2/content/base/ships/druuge/mauler-med.5.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.5.png
rename to sc2/content/base/ships/druuge/mauler-med.5.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.6.png b/sc2/content/base/ships/druuge/mauler-med.6.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.6.png
rename to sc2/content/base/ships/druuge/mauler-med.6.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.7.png b/sc2/content/base/ships/druuge/mauler-med.7.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.7.png
rename to sc2/content/base/ships/druuge/mauler-med.7.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.8.png b/sc2/content/base/ships/druuge/mauler-med.8.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.8.png
rename to sc2/content/base/ships/druuge/mauler-med.8.png
diff --git a/sc2/content/base/ships/druuge/druuge.med.9.png b/sc2/content/base/ships/druuge/mauler-med.9.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.med.9.png
rename to sc2/content/base/ships/druuge/mauler-med.9.png
diff --git a/sc2/content/base/ships/druuge/mauler-med.ani b/sc2/content/base/ships/druuge/mauler-med.ani
new file mode 100644
index 000000000..6b57ec0c2
--- /dev/null
+++ b/sc2/content/base/ships/druuge/mauler-med.ani
@@ -0,0 +1,16 @@
+mauler-med.0.png 0 1 3 11
+mauler-med.1.png 0 1 4 10
+mauler-med.2.png 0 1 5 8
+mauler-med.3.png 0 1 5 6
+mauler-med.4.png 0 1 5 2
+mauler-med.5.png 0 1 5 4
+mauler-med.6.png 0 1 5 4
+mauler-med.7.png 0 1 4 5
+mauler-med.8.png 0 1 4 5
+mauler-med.9.png 0 1 6 5
+mauler-med.10.png 0 1 9 4
+mauler-med.11.png 0 1 11 4
+mauler-med.12.png 0 1 13 4
+mauler-med.13.png 0 1 11 6
+mauler-med.14.png 0 1 9 8
+mauler-med.15.png 0 1 6 10
diff --git a/sc2/content/base/ships/druuge/druuge.big.2.png b/sc2/content/base/ships/druuge/mauler-meleeicons.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.big.2.png
rename to sc2/content/base/ships/druuge/mauler-meleeicons.0.png
diff --git a/sc2/content/base/ships/druuge/drumicon.1.png b/sc2/content/base/ships/druuge/mauler-meleeicons.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/drumicon.1.png
rename to sc2/content/base/ships/druuge/mauler-meleeicons.1.png
diff --git a/sc2/content/base/ships/druuge/mauler-meleeicons.ani b/sc2/content/base/ships/druuge/mauler-meleeicons.ani
new file mode 100644
index 000000000..cb08f02dd
--- /dev/null
+++ b/sc2/content/base/ships/druuge/mauler-meleeicons.ani
@@ -0,0 +1,2 @@
+mauler-meleeicons.0.png 0 1 14 14
+mauler-meleeicons.1.png 0 1 3 3
diff --git a/sc2/content/base/ships/druuge/druuge.sml.0.png b/sc2/content/base/ships/druuge/mauler-sml.0.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.0.png
rename to sc2/content/base/ships/druuge/mauler-sml.0.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.1.png b/sc2/content/base/ships/druuge/mauler-sml.1.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.1.png
rename to sc2/content/base/ships/druuge/mauler-sml.1.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.10.png b/sc2/content/base/ships/druuge/mauler-sml.10.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.10.png
rename to sc2/content/base/ships/druuge/mauler-sml.10.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.11.png b/sc2/content/base/ships/druuge/mauler-sml.11.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.11.png
rename to sc2/content/base/ships/druuge/mauler-sml.11.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.12.png b/sc2/content/base/ships/druuge/mauler-sml.12.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.12.png
rename to sc2/content/base/ships/druuge/mauler-sml.12.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.13.png b/sc2/content/base/ships/druuge/mauler-sml.13.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.13.png
rename to sc2/content/base/ships/druuge/mauler-sml.13.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.14.png b/sc2/content/base/ships/druuge/mauler-sml.14.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.14.png
rename to sc2/content/base/ships/druuge/mauler-sml.14.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.15.png b/sc2/content/base/ships/druuge/mauler-sml.15.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.15.png
rename to sc2/content/base/ships/druuge/mauler-sml.15.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.2.png b/sc2/content/base/ships/druuge/mauler-sml.2.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.2.png
rename to sc2/content/base/ships/druuge/mauler-sml.2.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.3.png b/sc2/content/base/ships/druuge/mauler-sml.3.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.3.png
rename to sc2/content/base/ships/druuge/mauler-sml.3.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.4.png b/sc2/content/base/ships/druuge/mauler-sml.4.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.4.png
rename to sc2/content/base/ships/druuge/mauler-sml.4.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.5.png b/sc2/content/base/ships/druuge/mauler-sml.5.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.5.png
rename to sc2/content/base/ships/druuge/mauler-sml.5.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.6.png b/sc2/content/base/ships/druuge/mauler-sml.6.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.6.png
rename to sc2/content/base/ships/druuge/mauler-sml.6.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.7.png b/sc2/content/base/ships/druuge/mauler-sml.7.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.7.png
rename to sc2/content/base/ships/druuge/mauler-sml.7.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.8.png b/sc2/content/base/ships/druuge/mauler-sml.8.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.8.png
rename to sc2/content/base/ships/druuge/mauler-sml.8.png
diff --git a/sc2/content/base/ships/druuge/druuge.sml.9.png b/sc2/content/base/ships/druuge/mauler-sml.9.png
similarity index 100%
rename from sc2/content/base/ships/druuge/druuge.sml.9.png
rename to sc2/content/base/ships/druuge/mauler-sml.9.png
diff --git a/sc2/content/base/ships/druuge/mauler-sml.ani b/sc2/content/base/ships/druuge/mauler-sml.ani
new file mode 100644
index 000000000..44ed6c0dd
--- /dev/null
+++ b/sc2/content/base/ships/druuge/mauler-sml.ani
@@ -0,0 +1,16 @@
+mauler-sml.0.png 0 1 1 5
+mauler-sml.1.png 0 1 2 4
+mauler-sml.2.png 0 1 2 4
+mauler-sml.3.png 0 1 2 2
+mauler-sml.4.png 0 1 2 1
+mauler-sml.5.png 0 1 2 1
+mauler-sml.6.png 0 1 2 2
+mauler-sml.7.png 0 1 2 2
+mauler-sml.8.png 0 1 2 2
+mauler-sml.9.png 0 1 2 2
+mauler-sml.10.png 0 1 4 2
+mauler-sml.11.png 0 1 5 1
+mauler-sml.12.png 0 1 6 1
+mauler-sml.13.png 0 1 5 2
+mauler-sml.14.png 0 1 4 4
+mauler-sml.15.png 0 1 3 4
diff --git a/sc2/content/base/ships/druuge/druditty.mod b/sc2/content/base/ships/druuge/mauler.mod
similarity index 100%
rename from sc2/content/base/ships/druuge/druditty.mod
rename to sc2/content/base/ships/druuge/mauler.mod
diff --git a/sc2/content/base/ships/druuge/drusound.snd b/sc2/content/base/ships/druuge/mauler.snd
similarity index 100%
rename from sc2/content/base/ships/druuge/drusound.snd
rename to sc2/content/base/ships/druuge/mauler.snd
diff --git a/sc2/content/base/ships/druuge/drutext.txt b/sc2/content/base/ships/druuge/mauler.txt
similarity index 100%
rename from sc2/content/base/ships/druuge/drutext.txt
rename to sc2/content/base/ships/druuge/mauler.txt