This commit is contained in:
Aevann1 2021-08-31 20:47:26 +02:00
parent fefe70f0d0
commit 8d8476488d
15 changed files with 17 additions and 16 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View file

@ -40,7 +40,7 @@ document.body.addEventListener('keydown', function(event) {
const emojis = [
{
type:'marsey',
emojis: ['marseybattered','marseybiden','marseyboomer','marseybrainlet','marseybush','marseycamus','marseycarp','marseychef','marseyclown','marseycop','marseycorn','marseycwc','marseydrunk','marseydynamite','marseyfamily','marseyfbi','marseyfeet','marseyfeminist','marseyflamethrower','marseyghost','marseygigaretard','marseygigavaxxer','marseygodfather','marseygrass','marseyilluminati','marseymyeisha','marseypharaoh','marseypinochet','marseypoggers','marseyqoomer','marseyradioactive','marseyshisha','marseystroke','marseytea','marseytrans2','marseytwerking','marseyzoomer','marseyzwei','marseyjam','marseyhmm','marseyhmmm','marseythonk','marseyworried','marseysus','marsey420','marsey4chan','marseyandmarcus','marseybluecheck','marseybong','marseybooba','marseybride','marseychonker','marseyconfused','marseydespair','marseyjunkie','marseylizard','marseylolcow','marseymommy','marseyneckbeard','marseyowow','marseyproctologist','marseyrealwork','marseyrowling','marseyschizo','marseyspider','marseyuwuw','marseyvaxmaxx','marseyxd','marsoyhype','marmsey','marsey1984','marseyakshually','marseycanned','marseycoomer','marseycope','marseycumjar1','marseycumjar2','marseycumjar3','marseydeux','marseydoomer','marseyflamewar','marseyfug','marseygasp','marseyglow','marseygoodnight','marseyhacker','marseyking','marseylawlz','marseylifting','marseymanlet','marseymaoist','marseymouse','marseyniqab','marseynpc','marseyorthodox','marseypainter','marseypeacekeeper','marseypickle','marseypipe','marseypirate','marseypope','marseyrat','marseyrick','marseyrope','marseyseethe','marseysneed','marseysociety','marseysrdine','marseytaliban','marseytank','marseytankushanka','marseytrans','marseytroll','marseyunabomber','marseyvan','marseyyeezus','marsoy','marseyasian','marseyblm','marseyburger','marseydildo','marseyfacepalm','marseygrilling','marseyjanny','marseymermaid','marseyrentfree','marseyretard','marseysadcat','marseysick','marseysmug','marseytrain', 'marseysipping', 'marseyjamming','marseyangel','marseyblowkiss','marseycry','marseydead','marseyexcited','marseygift','marseyinabox','marseylaugh','marseylove','marseymad','marseyparty','marseyrain','marseyreading','marseyready','marseysad','marseyscarf','marseyshook','marseysleep','marseythumbsup','marseywave', 'marsey69', 'marseycomrade', 'marseyira', 'marseyisis', 'marseymerchant', 'marseynut', 'marseyreich', 'marseyglam', 'marseycowboy', 'marseypat', 'marseypanties', 'marseybingus', 'marseydepressed']
emojis: ['marseycatgirl','marseykkk','marseymcarthur','marseybattered','marseybiden','marseyboomer','marseybrainlet','marseybush','marseycamus','marseycarp','marseychef','marseyclown','marseycop','marseycorn','marseycwc','marseydrunk','marseydynamite','marseyfamily','marseyfbi','marseyfeet','marseyfeminist','marseyflamethrower','marseyghost','marseygigaretard','marseygigavaxxer','marseygodfather','marseygrass','marseyilluminati','marseymyeisha','marseypharaoh','marseypinochet','marseypoggers','marseyqoomer','marseyradioactive','marseyshisha','marseystroke','marseytea','marseytrans2','marseytwerking','marseyzoomer','marseyzwei','marseyjam','marseyhmm','marseyhmmm','marseythonk','marseyworried','marseysus','marsey420','marsey4chan','marseyandmarcus','marseybluecheck','marseybong','marseybooba','marseybride','marseychonker','marseyconfused','marseydespair','marseyjunkie','marseylizard','marseylolcow','marseymommy','marseyneckbeard','marseyowow','marseyproctologist','marseyrealwork','marseyrowling','marseyschizo','marseyspider','marseyuwuw','marseyvaxmaxx','marseyxd','marsoyhype','marmsey','marsey1984','marseyakshually','marseycanned','marseycoomer','marseycope','marseycumjar1','marseycumjar2','marseycumjar3','marseydeux','marseydoomer','marseyflamewar','marseyfug','marseygasp','marseyglow','marseygoodnight','marseyhacker','marseyking','marseylawlz','marseylifting','marseymanlet','marseymaoist','marseymouse','marseyniqab','marseynpc','marseyorthodox','marseypainter','marseypeacekeeper','marseypickle','marseypipe','marseypirate','marseypope','marseyrat','marseyrick','marseyrope','marseyseethe','marseysneed','marseysociety','marseysrdine','marseytaliban','marseytank','marseytankushanka','marseytrans','marseytroll','marseyunabomber','marseyvan','marseyyeezus','marsoy','marseyasian','marseyblm','marseyburger','marseydildo','marseyfacepalm','marseygrilling','marseyjanny','marseymermaid','marseyrentfree','marseyretard','marseysadcat','marseysick','marseysmug','marseytrain', 'marseysipping', 'marseyjamming','marseyangel','marseyblowkiss','marseycry','marseydead','marseyexcited','marseygift','marseyinabox','marseylaugh','marseylove','marseymad','marseyparty','marseyrain','marseyreading','marseyready','marseysad','marseyscarf','marseyshook','marseysleep','marseythumbsup','marseywave', 'marsey69', 'marseycomrade', 'marseyira', 'marseyisis', 'marseymerchant', 'marseynut', 'marseyreich', 'marseyglam', 'marseycowboy', 'marseypat', 'marseypanties', 'marseybingus', 'marseydepressed']
},
{
type:'platy',

View file

@ -126,11 +126,11 @@ def monthly(v):
grant_awards["shit"] = 5
grant_awards["gold"] = 5
grant_awards["ban"] = 1
elif u.patron == 4 or u.patron == 8:
elif u.patron == 4:
grant_awards["shit"] = 10
grant_awards["gold"] = 10
grant_awards["ban"] = 3
elif u.patron == 5:
elif u.patron == 5 or u.patron == 8:
grant_awards["shit"] = 20
grant_awards["gold"] = 20
grant_awards["ban"] = 6

View file

@ -26,10 +26,11 @@ tiers={
"(Landchad)": 3,
"(Terminally online turboautist)": 4,
"(Footpig)": 5,
"(Ape)": 1,
"(Monke)": 2,
"(Chad)": 1,
"(Megachad)": 2,
"(Gigachad)": 3,
"(Ascended Griller)": 4
"(Terachad)": 4,
"(Petachad)": 5
}
@app.post("/settings/removebackground")
@ -285,12 +286,12 @@ def gumroad(v):
grant_awards["shit"] = 5
grant_awards["gold"] = 5
grant_awards["ban"] = 1
elif tier == 4 or tier == 8:
elif tier == 4:
if v.discord_id: add_role(v, "4")
grant_awards["shit"] = 10
grant_awards["gold"] = 10
grant_awards["ban"] = 3
elif tier == 5:
elif tier == 5 or tier == 8:
if v.discord_id: add_role(v, "5")
grant_awards["shit"] = 20
grant_awards["gold"] = 20

View file

@ -1161,7 +1161,7 @@
{% include "expanded_image_modal.html" %}
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
<!-- ClipboardJS -->

View file

@ -145,6 +145,6 @@ We also have some custom hooks for mentioning users and subreddits. Note that th
{% include "expanded_image_modal.html" %}
{% include "expanded_video_modal.html" %}
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
{% endblock %}

View file

@ -130,7 +130,7 @@
{% include "bootstrap.html" %}
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
</body>

View file

@ -254,7 +254,7 @@
</div>
</div>
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
{% block onload %}{% endblock %}

View file

@ -226,7 +226,7 @@
});
</script>
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
{% block scripts %}
{% endblock %}

View file

@ -225,7 +225,7 @@
<!-- {{'SITE_NAME' | app_config}} JS -->
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
</body>

View file

@ -144,7 +144,7 @@
<!-- {{'SITE_NAME' | app_config}} JS -->
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
</body>

View file

@ -409,7 +409,7 @@
<!-- {{'SITE_NAME' | app_config}} JS -->
<script src="/assets/js/files.js"></script>
<script src="/assets/js/marseyscript.js"></script>
<!-- ClipboardJS -->