Merge remote-tracking branch 'shaners/rewrite'

Conflicts: dist/spritesheets.css
2013-10-29 23:15:03 -07:00
parent 5c915547b0 4b6d49a172
commit 1bfb6a88fd
6 changed files with 7 additions and 1 deletions
@@ -30,6 +30,12 @@
    background: url("../img/sprites/backer-only/BackerOnly-Pet-CerberusPup.gif") no-repeat;
 }

+.Pet-Dragon-Hydra {
+    width: 106px;
+    height: 89px;
+    background: url("../img/sprites/backer-only/ContributorOnly-Pet-Hydra.png") no-repeat;
+}
+
 .shop_shield_6 {background-position: -1040px 0}
 .shop_weapon_7 {background-position: -1080px 0}
 .shop_armor_6 {background-position: -1160px 0}