diff --git a/files/assets/images/emojis/boomerjam.webp b/files/assets/images/emojis/boomerjam.webp new file mode 100644 index 000000000..c577dce82 Binary files /dev/null and b/files/assets/images/emojis/boomerjam.webp differ diff --git a/files/assets/images/emojis/bubbles.webp b/files/assets/images/emojis/bubbles.webp new file mode 100644 index 000000000..881cc5159 Binary files /dev/null and b/files/assets/images/emojis/bubbles.webp differ diff --git a/files/assets/images/emojis/duckswim.webp b/files/assets/images/emojis/duckswim.webp new file mode 100644 index 000000000..dc6344fbf Binary files /dev/null and b/files/assets/images/emojis/duckswim.webp differ diff --git a/files/assets/images/emojis/goblina.webp b/files/assets/images/emojis/goblina.webp new file mode 100644 index 000000000..116ccba8c Binary files /dev/null and b/files/assets/images/emojis/goblina.webp differ diff --git a/files/assets/images/emojis/guidopepe.webp b/files/assets/images/emojis/guidopepe.webp new file mode 100644 index 000000000..c5cccbfb1 Binary files /dev/null and b/files/assets/images/emojis/guidopepe.webp differ diff --git a/files/assets/images/emojis/hitormiss2.webp b/files/assets/images/emojis/hitormiss2.webp new file mode 100644 index 000000000..29c672eda Binary files /dev/null and b/files/assets/images/emojis/hitormiss2.webp differ diff --git a/files/assets/images/emojis/hitormiss3.webp b/files/assets/images/emojis/hitormiss3.webp new file mode 100644 index 000000000..b2d6dd601 Binary files /dev/null and b/files/assets/images/emojis/hitormiss3.webp differ diff --git a/files/assets/images/emojis/jimdrink.webp b/files/assets/images/emojis/jimdrink.webp new file mode 100644 index 000000000..b23b0ae26 Binary files /dev/null and b/files/assets/images/emojis/jimdrink.webp differ diff --git a/files/assets/images/emojis/marseygroomerfreebsd.webp b/files/assets/images/emojis/marseygroomerfreebsd.webp new file mode 100644 index 000000000..577106ef5 Binary files /dev/null and b/files/assets/images/emojis/marseygroomerfreebsd.webp differ diff --git a/files/assets/images/emojis/marseymotherhugger.webp b/files/assets/images/emojis/marseymotherhugger.webp new file mode 100644 index 000000000..db9d1cb0b Binary files /dev/null and b/files/assets/images/emojis/marseymotherhugger.webp differ diff --git a/files/assets/images/emojis/pepeduck.webp b/files/assets/images/emojis/pepeduck.webp new file mode 100644 index 000000000..302e4f3b7 Binary files /dev/null and b/files/assets/images/emojis/pepeduck.webp differ diff --git a/files/assets/images/emojis/pepemoney.webp b/files/assets/images/emojis/pepemoney.webp new file mode 100644 index 000000000..6fdd0b272 Binary files /dev/null and b/files/assets/images/emojis/pepemoney.webp differ diff --git a/files/assets/images/emojis/ricardo.webp b/files/assets/images/emojis/ricardo.webp new file mode 100644 index 000000000..f3d39a91e Binary files /dev/null and b/files/assets/images/emojis/ricardo.webp differ diff --git a/files/assets/images/emojis/sanic2.webp b/files/assets/images/emojis/sanic2.webp new file mode 100644 index 000000000..3486617e1 Binary files /dev/null and b/files/assets/images/emojis/sanic2.webp differ diff --git a/files/assets/images/emojis/stalinjam.webp b/files/assets/images/emojis/stalinjam.webp new file mode 100644 index 000000000..60670af02 Binary files /dev/null and b/files/assets/images/emojis/stalinjam.webp differ diff --git a/seed-db.sql b/seed-db.sql index 985a0645b..0ed9224a8 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -46,10 +46,6 @@ INSERT INTO public.badge_defs VALUES (157, 'A Minor Setback', 'Lost a 1,000 coin INSERT INTO public.badge_defs VALUES (197, 'Best Marsey 2021', 'The creator of the best Marsey emote of 2021, as voted by rdrama users.', 1670627291); INSERT INTO public.badge_defs VALUES (198, 'Best Drama Post 2021', 'The author of the best drama post of 2021, as voted by rdrama users.', 1670627332); INSERT INTO public.badge_defs VALUES (199, 'Dramatard of the Year 2021', 'Voted as the best rdrama user of 2021. Congratulations!', 1670627437); -INSERT INTO public.badge_defs VALUES (21, 'Paypig', 'Contributes $5/month', NULL); -INSERT INTO public.badge_defs VALUES (22, 'Renthog', 'Contributes $10/month', NULL); -INSERT INTO public.badge_defs VALUES (23, 'Landchad', 'Contributes $20/month', NULL); -INSERT INTO public.badge_defs VALUES (24, 'Terminally online turboautist', 'Contributes $50/month', NULL); INSERT INTO public.badge_defs VALUES (163, 'Marsey Jacobs', 'Designed 10 hats!', NULL); INSERT INTO public.badge_defs VALUES (166, 'Giorgio Armarsey', 'Designed 250 hats 😲', NULL); INSERT INTO public.badge_defs VALUES (164, 'Marsey de Givenchy', 'Designed 50 hats, holy cap.', NULL); @@ -156,9 +152,6 @@ INSERT INTO public.badge_defs VALUES (171, 'Rainbowed', 'This user has super cut INSERT INTO public.badge_defs VALUES (135, '1st Birthgay Bash Survivor', 'Awarded for surviving rDrama''s first annual Birthgay Bash', NULL); INSERT INTO public.badge_defs VALUES (75, 'Homoween 2021 Survivor', 'Awarded for surviving Homoween 2021', NULL); INSERT INTO public.badge_defs VALUES (59, 'Lolcow', 'Beautiful and valid milk provider', NULL); -INSERT INTO public.badge_defs VALUES (25, 'Marsey''s Sugar Daddy', 'Contributes $100/month', NULL); -INSERT INTO public.badge_defs VALUES (26, 'JIDF Bankroller', 'Contributes $200/month', NULL); -INSERT INTO public.badge_defs VALUES (27, 'Rich Bich', 'Contributes $500/month', NULL); INSERT INTO public.badge_defs VALUES (118, 'Hit!', 'Confirmed removal of a r/stupidpol post for hate speech or threatening violence', NULL); INSERT INTO public.badge_defs VALUES (119, 'BIG Hit!', 'Confirmed removal of a /r/stupidpol MODERATOR''S post for hate speech or threatening violence', NULL); INSERT INTO public.badge_defs VALUES (120, 'Msar Bomba', 'Confirmed ban of a r/stupidpol user', NULL); @@ -186,6 +179,7 @@ INSERT INTO public.badge_defs VALUES (156, 'Hole Neglecter', 'Let a hole they ow INSERT INTO public.badge_defs VALUES (224, 'Died of Starvation', 'Couldn''t work out which elf had the most calories', 1672289576); INSERT INTO public.badge_defs VALUES (225, 'Monkey Playdate', 'Forgot to check their worry levels during Advent of Code 2022, completing at least 1 star.', 1672289660); INSERT INTO public.badge_defs VALUES (226, 'Stargazer', 'Kept themselves unworried throughout all of Advent of Code 2022, completing all 50 stars.', 1672289696); +INSERT INTO public.badge_defs VALUES (25, 'Marsey''s Sugar Daddy', 'Contributes $100/month', NULL); INSERT INTO public.badge_defs VALUES (227, 'Saved Christmas with Teh Codez', 'Got the highest score and completed all 50 stars during Advent of Code 2022.', 1672289744); INSERT INTO public.badge_defs VALUES (229, 'Certified MONSTER Cock', 'This user submitted a photo of their dick and it was confirmed to be HUGE', 1674147916); INSERT INTO public.badge_defs VALUES (230, 'Itty Bitty Clitty', 'This user submitted a photo of their dick and it was determined to be more similar to a sad, undersized clit', 1674147964); @@ -213,6 +207,12 @@ INSERT INTO public.badge_defs VALUES (251, 'Marsey Madness BRONZE', 'Had the thi INSERT INTO public.badge_defs VALUES (252, 'Marsey Madness Participation Trophy!', 'This lil fella did his best in the Marsey Madness 2023 tournament', 1681309336); INSERT INTO public.badge_defs VALUES (253, 'Matchmaker', 'Awarded for contributing to the Matchmaker Marsey event', 1681321487); INSERT INTO public.badge_defs VALUES (254, 'Peacemaker', 'Awarded for contributing to the rDrama-Reddit Alliance event', 1681321561); +INSERT INTO public.badge_defs VALUES (21, 'Paypig', 'Contributes $5/month', NULL); +INSERT INTO public.badge_defs VALUES (22, 'Renthog', 'Contributes $10/month', NULL); +INSERT INTO public.badge_defs VALUES (23, 'Landchad', 'Contributes $20/month', NULL); +INSERT INTO public.badge_defs VALUES (24, 'Terminally online turboautist', 'Contributes $50/month', NULL); +INSERT INTO public.badge_defs VALUES (26, 'JIDF Bankroller', 'Contributes $200/month', NULL); +INSERT INTO public.badge_defs VALUES (27, 'Rich Bich', 'Contributes $500/month', NULL); -- diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index 529021844..5faf60965 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -3757,4 +3757,16 @@ My fiancée is 5'8", really strong, but I've quietly learned over the years that It makes me think of how Black Widow fights bigger, stronger opponents in the Marvel Cinematic Universe. She puts her weight behind her punches, uses her body weight for throws, always disarms, and uses her guns and whatever else she can get her hands on while Captain ameriKKKa is right next to her, simply punching and kicking people. {[para]} -all you are doing is turning people away from your cause. i'm conservative and deeply religious but you make me want to donate to a transgender hospital because you wont shut up about trannies for 5 minutes. you shoehorn your dislike for transgenders every single chance you get, often times completely unrelated to the topic. we get it, you hate trannies. give it a rest. this is a site about internet drama not gender politics. go post on lipstick alley or gendercritical or whatever if thats all you want to talk about. and on the other side we have the trans jannies you hate so much, who never talk gender politics at all and are intelligent and hard workers. legitimately a pleasure to work with them. you are all talk and no walk to the point where you need a mute button and they consistently demonstrate their worth thru their actions and behavior. now please explain to me why I should want to hate trannies so much? \ No newline at end of file +all you are doing is turning people away from your cause. i'm conservative and deeply religious but you make me want to donate to a transgender hospital because you wont shut up about trannies for 5 minutes. you shoehorn your dislike for transgenders every single chance you get, often times completely unrelated to the topic. we get it, you hate trannies. give it a rest. this is a site about internet drama not gender politics. go post on lipstick alley or gendercritical or whatever if thats all you want to talk about. and on the other side we have the trans jannies you hate so much, who never talk gender politics at all and are intelligent and hard workers. legitimately a pleasure to work with them. you are all talk and no walk to the point where you need a mute button and they consistently demonstrate their worth thru their actions and behavior. now please explain to me why I should want to hate trannies so much? +{[para]} +Ever since I hit puberty, I realized I was all about that sapphic love. I dated tomboys because they were cute. I blossomed into adulthood as a proud lesbian. + +I noticed a huge component was missing from the sapphic relationships I was in. + +Penis! + +It’s so appalling that the society tells women especially lesbians like me to be disgusted by penises. This is the root of TERF movement. They are terrified of penises! + +Well, I chose not to be a genital obsessed bigot like those conservatives who want to inspect our genitals before we can enter into the restrooms. + +I had to reeducate myself to be better and more progressive. Now I am a proud sapphic lesbian goddess who dates men. I’m so glad I am no longer a genital essentialist! For all we know, penis havers I’ve dated could very well be female! What are you gonna do, conservatives? Test our chromosomes? \ No newline at end of file