diff --git a/files/assets/images/emojis/marseyfloyd.gif b/files/assets/images/emojis/marseyfloyd.gif
new file mode 100644
index 000000000..48300f9f6
Binary files /dev/null and b/files/assets/images/emojis/marseyfloyd.gif differ
diff --git a/files/assets/images/emojis/marseytrump.gif b/files/assets/images/emojis/marseytrump.gif
new file mode 100644
index 000000000..6143c086c
Binary files /dev/null and b/files/assets/images/emojis/marseytrump.gif differ
diff --git a/files/assets/js/general3.js b/files/assets/js/general4.js
similarity index 92%
rename from files/assets/js/general3.js
rename to files/assets/js/general4.js
index 5e6db602d..57faedf3c 100644
--- a/files/assets/js/general3.js
+++ b/files/assets/js/general4.js
@@ -40,7 +40,7 @@ document.body.addEventListener('keydown', function(event) {
const emojis = [
{
type:'marsey',
- emojis: ['marseynun','marcusfootball','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']
+ emojis: ['marseyfloyd','marseytrump','marseynun','marcusfootball','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',
diff --git a/files/routes/users.py b/files/routes/users.py
index 569387d39..815112ffc 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -44,13 +44,13 @@ def steal(v):
return "You must have more than 100 coins in order to attempt stealing."
u = get_account(253)
if random.randint(1, 10) < 5:
- v.coins += 1000
+ v.coins += 700
v.steal_utc = int(time.time())
g.db.add(v)
- u.coins -= 1000
+ u.coins -= 700
g.db.add(u)
- send_notification(NOTIFICATIONS_ACCOUNT, u, f"Some [grubby little rentoid](/@{v.username}) has absconded with 1000 of your hard-earned dramacoins to fuel his Funko Pop addiction. Stop being so trusting.")
- send_notification(NOTIFICATIONS_ACCOUNT, v, f"You have successfully shorted your heroic landlord 1000 dramacoins in rent. You're slightly less materially poor, but somehow even moreso morally. Are you proud of yourself?")
+ send_notification(NOTIFICATIONS_ACCOUNT, u, f"Some [grubby little rentoid](/@{v.username}) has absconded with 700 of your hard-earned dramacoins to fuel his Funko Pop addiction. Stop being so trusting.")
+ send_notification(NOTIFICATIONS_ACCOUNT, v, f"You have successfully shorted your heroic landlord 700 dramacoins in rent. You're slightly less materially poor, but somehow even moreso morally. Are you proud of yourself?")
else:
if random.random() < 0.15:
send_notification(NOTIFICATIONS_ACCOUNT, u, f"You caught [this sniveling little renthog](/@{v.username}) trying to rob you. After beating him within an inch of his life, you sold his Nintendo Switch for 500 dramacoins and called the cops. He was sentenced to one (1) day in renthog prison.")
diff --git a/files/templates/default.html b/files/templates/default.html
index f617dee4e..721d0282e 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1161,7 +1161,7 @@
{% include "expanded_image_modal.html" %}
-
+
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 9bfca0005..7e79915db 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -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" %}
-
+
{% endblock %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 1b73d3fba..3b598009a 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -130,7 +130,7 @@
{% include "bootstrap.html" %}
-
+
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 9b606f41d..1ecd09cfd 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -254,7 +254,7 @@
-