diff --git a/files/assets/CHRISTMAS/js/emoji_modal.js b/files/assets/CHRISTMAS/js/emoji_modal.js index 02030176c..04fc2e5b7 100644 --- a/files/assets/CHRISTMAS/js/emoji_modal.js +++ b/files/assets/CHRISTMAS/js/emoji_modal.js @@ -313,7 +313,7 @@ const EMOJIS_STRINGS = [ marseyduck: 'bird beak', marseyduck2: 'onesie', marseydynamite: 'dynomite black afro gun', - marseyegg_irl: 'troomer tranny transgender lgbt groomer troid transsexual', + marseyeggirl: 'troomer tranny transgender lgbt groomer troid transsexual', marseyeldritch: 'lovecraft horror halloween tentacles holiday scary monster', marseyeldritch2: 'horror halloween lovecraftian holiday scary', marseyelephant: 'oliphant dumbo', @@ -875,12 +875,12 @@ function loadEmojis(form) { if (i == 0) { for (const [key, value] of Object.entries(arr)) { - str += ``; + str += ``; } } else { for (let j = 0; j < arr.length; j++) { - str += ``; + str += ``; } } @@ -895,7 +895,7 @@ function loadEmojis(form) { let container = document.getElementById(`EMOJIS_${EMOJIS_STRINGS[i].type}`) for (let j = 0; j < arr.length; j++) { if (arr[j].match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(arr[j])) { - str += ``; + str += ``; } } @@ -905,7 +905,7 @@ function loadEmojis(form) { for (const [key, value] of Object.entries(arr2)) { if (str.includes(`'${key}'`)) continue; if (key.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(key) || value.match(search_bar.value.toLowerCase())) { - str += ``; + str += ``; } } container.innerHTML = "" @@ -928,7 +928,7 @@ if (favorite_emojis) ); for (const emoji of Object.keys(sortable)) - str += `` + str += `` document.getElementById('EMOJIS_favorite').innerHTML = str } diff --git a/files/assets/CHRISTMAS/js/marked.js b/files/assets/CHRISTMAS/js/marked.js index 560afa90f..e70fd0292 100644 --- a/files/assets/CHRISTMAS/js/marked.js +++ b/files/assets/CHRISTMAS/js/marked.js @@ -11,15 +11,15 @@ function markdown(first, second) { var remoji = emoji.replace(/:/g,''); if (remoji.startsWith("!#") || remoji.startsWith("#!")) { - input = input.replace(emoji, "") + input = input.replace(emoji, "") } else if (remoji.startsWith("#")) { - input = input.replace(emoji, "") + input = input.replace(emoji, "") } else if (remoji.startsWith("!")) { - input = input.replace(emoji, "") + input = input.replace(emoji, "") } else { - input = input.replace(emoji, "") + input = input.replace(emoji, "") } } } diff --git a/files/assets/images/emojis/marseyeggirl.webp b/files/assets/images/emojis/marseyeggirl.webp new file mode 100644 index 000000000..246c05cee Binary files /dev/null and b/files/assets/images/emojis/marseyeggirl.webp differ diff --git a/files/templates/CHRISTMAS/awards/Trains.html b/files/templates/CHRISTMAS/awards/Trains.html index 66614907c..99b500f0f 100644 --- a/files/templates/CHRISTMAS/awards/Trains.html +++ b/files/templates/CHRISTMAS/awards/Trains.html @@ -2,18 +2,18 @@ - + {% if p.award_count("train") > 1 %} - + {% endif %} {% if p.award_count("train") > 2 %} - + {% endif %} {% if p.award_count("train") > 3 %} - + {% endif %}