diff --git a/files/assets/images/emojis/catmunch.webp b/files/assets/images/emojis/catmunch.webp new file mode 100644 index 000000000..16d1b3db4 Binary files /dev/null and b/files/assets/images/emojis/catmunch.webp differ diff --git a/files/assets/images/rDrama/sidebar/1181.webp b/files/assets/images/rDrama/sidebar/1181.webp new file mode 100644 index 000000000..7296160e3 Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1181.webp differ diff --git a/schema.sql b/schema.sql index 04c9425c2..d87128608 100644 --- a/schema.sql +++ b/schema.sql @@ -556,7 +556,6 @@ CREATE TABLE public.commentvotes ( comment_id integer NOT NULL, vote_type integer NOT NULL, user_id integer NOT NULL, - app_id integer, "real" boolean DEFAULT true NOT NULL, created_utc integer NOT NULL, coins smallint DEFAULT 1 NOT NULL @@ -1129,7 +1128,6 @@ CREATE TABLE public.votes ( user_id integer NOT NULL, post_id integer NOT NULL, vote_type integer NOT NULL, - app_id integer, "real" boolean DEFAULT true NOT NULL, created_utc integer NOT NULL, coins smallint DEFAULT 1 NOT NULL diff --git a/seed-db.sql b/seed-db.sql index a4d05c44e..d93eddc93 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -117,9 +117,7 @@ INSERT INTO public.badge_defs VALUES (90, 'Fish', 'This user cannot be unfollowe INSERT INTO public.badge_defs VALUES (91, 'Grinch', 'This user is a joyless grinch who pays money to avoid having fun', NULL); INSERT INTO public.badge_defs VALUES (92, 'NFT Artist', 'Drew a marsey that was used as an NFT', NULL); INSERT INTO public.badge_defs VALUES (93, 'NFT Owner', 'Bought a marsey NFT', NULL); -INSERT INTO public.badge_defs VALUES (94, 'Progressive Stack Award', 'Upvotes/downvotes on this user''s posts and comments have double the ranking effect', NULL); INSERT INTO public.badge_defs VALUES (95, 'Bird Site Award', 'This user is limited to 140 characters', NULL); -INSERT INTO public.badge_defs VALUES (96, 'Flairlock Award', 'This user''s flair has been locked by someone else', NULL); INSERT INTO public.badge_defs VALUES (97, 'Pizzashill Award', 'This user has to make their posts and comments more than 280 characters', NULL); INSERT INTO public.badge_defs VALUES (98, 'Marsey Award', 'This user is limited to posting marseys', NULL); INSERT INTO public.badge_defs VALUES (99, 'Sidebar Artist', 'Contributed artwork featured on the sidebar', NULL); @@ -183,6 +181,7 @@ INSERT INTO public.badge_defs VALUES (227, 'Saved Christmas with Teh Codez', 'Go 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); INSERT INTO public.badge_defs VALUES (161, 'Pro Goombler', 'Won a 10,000 coin bet. Some would say to quit while you''re ahead, but they didn''t just win 10k - keep at it!', NULL); +INSERT INTO public.badge_defs VALUES (96, 'Flairlock', 'This user''s flair has been locked by someone else', NULL); INSERT INTO public.badge_defs VALUES (216, 'Human Rights Abuse Profiteer', 'I hope those 6500 deaths were worth the coin.', 1671150403); INSERT INTO public.badge_defs VALUES (231, 'SICK FUCK', 'Awarded for contributing to the Morbid Marsey event', 1677791640); INSERT INTO public.badge_defs VALUES (232, 'Hardcore Gaymer', 'Awarded for contributing to the Gaymer Marsey event', 1677799338); @@ -248,6 +247,7 @@ INSERT INTO public.badge_defs VALUES (287, 'Carp Artisan', 'Contributed a Carp e INSERT INTO public.badge_defs VALUES (288, 'Carp Master', 'Contributed 10 (or more!!!!) Carp emojis ✨', 1687530535); INSERT INTO public.badge_defs VALUES (289, 'Sharpened', 'No one understand this user.', 1687725417); INSERT INTO public.badge_defs VALUES (290, 'Smartest Fish Award', 'Awarded for outstanding achievement in the field of QA, signed by Aevann Himself. The highest honor that can be bestowed upon a codecel.', 1687901922); +INSERT INTO public.badge_defs VALUES (94, 'Progressive Stack', 'Upvotes/downvotes on this user''s posts and comments have double the ranking effect', NULL); -- @@ -1720,6 +1720,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('cartwheel','Classic',2,'cartwheel emoticon animated gymnastics'), ('casanovanova','Misc',2,'indian man'), ('cat','Classic',2,'cat animated cute itch sleep wake up'), +('catmunch','Misc',2,'chips popcorn eating'), ('caughtone','Misc',2,'l detained drugs'), ('ccedilla','Marsey Alphabet',2,'letter'), ('celebrate','Classic',2,'celebrate emoticon party'), @@ -2374,6 +2375,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marcerberus','Marsey',2,'threeheadeddog horror halloween holiday greek three headed dog monster'), ('marchipmunk','Marsey',2,'rodent squirrel wuzizname'), ('marchipmunklove','Marsey',2,'chipmonk adoration loving rodent heart eyes adore acorn'), +('marcusbeachtowel','Marsey',2,'summer beach towel drink june july august warm hot relax'), ('marcuscop','Marsey',2,'police officer acab thin blue line pig black bipoc'), ('marcusfootball','Marsey',2,'sport handegg hand egg athlete helmet'), ('marcussatisfied','Marsey',2,'black bipoc satisfying happy smile delightful grateful glad wholesome'), @@ -3937,7 +3939,6 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseymap2','Marsey',2,'map geography topographical paper navigation chart cartography location place'), ('marseymar','Marsey',2,'dexter lab foid destruction irritating annoying sister cartoon network pigtails'), ('marseymarch','Marsey',2,'retard groyper march fat pepe drool hallway'), -('marseymarcusbeachtowel','Marsey',2,'summer beach towel drink june july august warm hot relax'), ('marseymarfan','Marsey',2,'cumtown chud indian curry pajeet bipoc brown black glasses janny admin'), ('marseymariachi','Marsey',2,'animated latinx latino mexican mexico beaner taco burrito'), ('marseymario','Marsey',2,'mario nintendo vidya nintendo marseyo'), diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index e701b1b39..d00a0826d 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -3890,4 +3890,6 @@ You will never be president. You wrench out a fake smile every single morning an Eventually it’ll be too much to bear – you’ll lose Super Tuesday, send a letter out to your supporters, check Twitter one last time, and drop out. You'll set up a meeting with Trump, the real candidate, heartbroken but hopeful that there might be a place for you in the new administration. You'll ask for Secretary of State, Treasury, or Defense, but be given Transportation instead. Finally, you will be removed from your pathetic cabinet position by 2025 over Twitter, and all that will remain of your legacy is an "other" category on the 2024 Presidential Election Polls Wikipedia page. -This is your fate. This is what you chose. There is no turning back. \ No newline at end of file +This is your fate. This is what you chose. There is no turning back. +{[para]} +Kill moids. Behead moids. Roundhouse kick a moid into the concrete. Slam dunk a moid baby into the trashcan. Crucify filthy moids. Defecate in a moids food. Launch moids into the sun. Stir fry moids in a wok. Toss moids into active volcanoes. Urinate into a moids gas tank. Judo throw moids into a wood chipper. Twist moids heads off. Report moids to the IRS. Karate chop moids in half. Curb stomp pregnant white moids. Trap moids in quicksand. Crush moids in the trash compactor. Liquefy moids in a vat of acid. Eat moids. Dissect moids. Exterminate moids in the gas chamber. Stomp moid skulls with steel toed boots. Cremate moids in the oven. Lobotomize moids. Mandatory abortions for moids. Grind moid fetuses in the garbage disposal. Drown moids in fried chicken grease. Vaporize moids with a ray gun. Kick old moids down the stairs. Feed moids to alligators. Slice moids with a katana. \ No newline at end of file