Merge pull request #375 from SabreCat/develop

December backgrounds
2026-08-02 04:00:36 +00:00 · 2014-11-30 23:20:22 -06:00 · 2014-11-30 23:20:22 -06:00 · a6944ec072
commit a6944ec072
parent 703451d452 d7b904efec
19 changed files with 2326 additions and 2290 deletions
--- a/dist/habitrpg-shared.css
+++ b/dist/habitrpg-shared.css
--- a/dist/spritesmith0.css
+++ b/dist/spritesmith0.css
--- a/dist/spritesmith0.png
+++ b/dist/spritesmith0.png
--- a/dist/spritesmith1.css
+++ b/dist/spritesmith1.css
--- a/dist/spritesmith1.png
+++ b/dist/spritesmith1.png
--- a/dist/spritesmith2.css
+++ b/dist/spritesmith2.css
--- a/dist/spritesmith2.png
+++ b/dist/spritesmith2.png
--- a/dist/spritesmith3.css
+++ b/dist/spritesmith3.css
--- a/dist/spritesmith3.png
+++ b/dist/spritesmith3.png
--- a/dist/spritesmith4.css
+++ b/dist/spritesmith4.css
--- a/dist/spritesmith4.png
+++ b/dist/spritesmith4.png
--- a/dist/spritesmith5.css
+++ b/dist/spritesmith5.css
--- a/dist/spritesmith5.png
+++ b/dist/spritesmith5.png
--- a/img/sprites/spritesmith/backgrounds/background_iceberg.png
+++ b/img/sprites/spritesmith/backgrounds/background_iceberg.png
--- a/img/sprites/spritesmith/backgrounds/background_south_pole.png
+++ b/img/sprites/spritesmith/backgrounds/background_south_pole.png
--- a/img/sprites/spritesmith/backgrounds/background_twinkly_lights.png
+++ b/img/sprites/spritesmith/backgrounds/background_twinkly_lights.png
--- a/img/sprites/spritesmith/misc/inventory_present.png
+++ b/img/sprites/spritesmith/misc/inventory_present.png
--- a/locales/en/backgrounds.json
+++ b/locales/en/backgrounds.json
@ -47,5 +47,13 @@
  "backgroundStarrySkiesText":"Starry Skies",
  "backgroundStarrySkiesNotes":"Gaze at the Starry Skies.",
  "backgroundSunsetMeadowText":"Sunset Meadow",
-  "backgroundSunsetMeadowNotes":"Admire a Sunset Meadow."
+  "backgroundSunsetMeadowNotes":"Admire a Sunset Meadow.",
+
+  "backgrounds122014": "SET 7: Released December 2014",
+  "backgroundIcebergText":"Iceberg",
+  "backgroundIcebergNotes":"Drift upon an Iceberg.",
+  "backgroundTwinklyLightsText":"Winter Twinkly Lights",
+  "backgroundTwinklyLightsNotes":"Stroll between trees bedecked in festive lights.",
+  "backgroundSouthPoleText":"South Pole",
+  "backgroundSouthPoleNotes":"Visit the icy South Pole."
 }
--- a/script/content.coffee
+++ b/script/content.coffee
@ -1360,6 +1360,16 @@ api.backgrounds =
    starry_skies:
      text:  t('backgroundStarrySkiesText')
      notes: t('backgroundStarrySkiesNotes')
+  backgrounds122014:
+    iceberg:
+      text:  t('backgroundIcebergText')
+      notes: t('backgroundIcebergNotes')
+    twinkly_lights:
+      text:  t('backgroundTwinklyLightsText')
+      notes: t('backgroundTwinklyLightsNotes')
+    south_pole:
+      text:  t('backgroundSouthPoleText')
+      notes: t('backgroundSouthPoleNotes')

 repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true}
 api.userDefaults =