add spooktober 4U, SHUSH, and SWEATY by Gehirnchirurg

MemeLabs · Oct 11, 2024 · 795031a · 795031a
1 parent 1586429
commit 795031a
Show file tree

Hide file tree

Showing 21 changed files with 19 additions and 5 deletions.
diff --git a/assets/anim.october.scss b/assets/anim.october.scss
@@ -431,7 +431,6 @@
     $can-animate-forever: true
 );
 
-
 @include sprite-animation(
     $file-name: PEPE,
     $frame-count: 150,
@@ -443,3 +442,14 @@
     $end-on-last-frame: true,
     $can-animate-forever: true
 );
+
+@include sprite-animation(
+    $file-name: SHUSH,
+    $frame-count: 4,
+    $sprite-width: 156px,
+    $sprite-height: 28px,
+    $animation-duration: 4s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
diff --git a/assets/anim.scss b/assets/anim.scss
@@ -906,7 +906,7 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
 @include sprite-animation(
     $file-name: SHUSH,
     $frame-count: 4,
-    $sprite-width: 112px,
+    $sprite-width: 156px,
     $sprite-height: 28px,
     $animation-duration: 4s,
     $iteration-count: 2,

diff --git a/assets/emotecreators.json b/assets/emotecreators.json
@@ -128,7 +128,7 @@
         },
         "SWEATY": {
             "createdby": "SoMuchForSubtlety",
-            "october": "",
+            "october": "Gehirnchirurg",
             "december": ""
         },
         "PEPE": {
@@ -592,7 +592,11 @@
             "october": "Nussinov",
             "december": ""
         },
-        "4U": { "createdby": "Boocra", "october": "", "december": "" },
+        "4U": {
+            "createdby": "Boocra",
+            "october": "Gehirnchirurg",
+            "december": ""
+        },
         "GandalfFace": { "createdby": "Boocra", "october": "Gehirnchirurg", "december": "" },
         "WICKED": { "createdby": "Gehirnchirurg", "october": "Gehirnchirurg", "december": "" },
         "DOGGO": {
@@ -678,7 +682,7 @@
         },
         "SHUSH": {
             "createdby": "Gehirnchirurg",
-            "october": "",
+            "october": "Gehirnchirurg",
             "december": ""
         },
         "HocusPocus": {

diff --git a/assets/emotes/emoticons-animated/2x/SHUSH.png b/assets/emotes/emoticons-animated/2x/SHUSH.png
diff --git a/assets/emotes/emoticons-animated/4x/SHUSH.png b/assets/emotes/emoticons-animated/4x/SHUSH.png
diff --git a/assets/emotes/emoticons-animated/SHUSH.png b/assets/emotes/emoticons-animated/SHUSH.png
diff --git a/assets/emotes/emoticons/2x/4U.png b/assets/emotes/emoticons/2x/4U.png
diff --git a/assets/emotes/emoticons/2x/SWEATY.png b/assets/emotes/emoticons/2x/SWEATY.png
diff --git a/assets/emotes/emoticons/4U.png b/assets/emotes/emoticons/4U.png
diff --git a/assets/emotes/emoticons/4x/4U.png b/assets/emotes/emoticons/4x/4U.png
diff --git a/assets/emotes/emoticons/4x/SWEATY.png b/assets/emotes/emoticons/4x/SWEATY.png
diff --git a/assets/emotes/emoticons/SWEATY.png b/assets/emotes/emoticons/SWEATY.png
diff --git a/assets/emotes/october/2x/4U.png b/assets/emotes/october/2x/4U.png
diff --git a/assets/emotes/october/2x/SWEATY.png b/assets/emotes/october/2x/SWEATY.png
diff --git a/assets/emotes/october/4U.png b/assets/emotes/october/4U.png
diff --git a/assets/emotes/october/4x/4U.png b/assets/emotes/october/4x/4U.png
diff --git a/assets/emotes/october/4x/SWEATY.png b/assets/emotes/october/4x/SWEATY.png
diff --git a/assets/emotes/october/SWEATY.png b/assets/emotes/october/SWEATY.png
diff --git a/assets/emotes/october/animated/2x/SHUSH.png b/assets/emotes/october/animated/2x/SHUSH.png
diff --git a/assets/emotes/october/animated/4x/SHUSH.png b/assets/emotes/october/animated/4x/SHUSH.png
diff --git a/assets/emotes/october/animated/SHUSH.png b/assets/emotes/october/animated/SHUSH.png