diff --git a/files/assets/images/emojis/marseymlpowned.webp b/files/assets/images/emojis/marseymlpowned.webp new file mode 100644 index 000000000..ac92251a4 Binary files /dev/null and b/files/assets/images/emojis/marseymlpowned.webp differ diff --git a/files/assets/images/emojis/marseyvivianjames.webp b/files/assets/images/emojis/marseyvivianjames.webp new file mode 100644 index 000000000..bc24179e2 Binary files /dev/null and b/files/assets/images/emojis/marseyvivianjames.webp differ diff --git a/seed-badges.sql b/seed-badges.sql index 9e5275eee..e47010b17 100644 --- a/seed-badges.sql +++ b/seed-badges.sql @@ -66,7 +66,6 @@ INSERT INTO public.badge_defs VALUES (2, 'Verified Email', 'Verified Email', NUL INSERT INTO public.badge_defs VALUES (3, 'Code Contributor', 'Contributed to the site''s source code', NULL); INSERT INTO public.badge_defs VALUES (185, 'Hallowgrinch', 'TP this Halloween-hating loser''s house.', 1666226224); INSERT INTO public.badge_defs VALUES (6, 'Beta User', 'Joined during open beta', NULL); -INSERT INTO public.badge_defs VALUES (7, 'Bug Chaser', 'Found a bug', NULL); INSERT INTO public.badge_defs VALUES (15, 'Idea Maker', 'Had a good idea for the site which was implemented by the developers', NULL); INSERT INTO public.badge_defs VALUES (16, 'Marsey Master', 'Contributed 10 (or more!!!!) Marsey emojis ✨', NULL); INSERT INTO public.badge_defs VALUES (17, 'Marsey Artisan', 'Contributed a Marsey emoji ✨', NULL); @@ -97,6 +96,7 @@ INSERT INTO public.badge_defs VALUES (197, 'Best Marsey 2021', 'The creator of t 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 (69, 'Little Big Spender', 'Dropped 10,000 coins at the award shop', NULL); INSERT INTO public.badge_defs VALUES (70, 'Big Spender', 'Dropped 100,000 coins at the award shop', NULL); +INSERT INTO public.badge_defs VALUES (7, 'Bug Chaser', 'Found and reported a bug', NULL); INSERT INTO public.badge_defs VALUES (77, 'Middle Roller', 'Bought 50 lootboxes', NULL); INSERT INTO public.badge_defs VALUES (78, 'High Roller', 'Bought 150 lootboxes', NULL); INSERT INTO public.badge_defs VALUES (79, 'Merchant', 'Contributed a new line of product to Marsey''s Coin Emporium', NULL); diff --git a/seed-emojis-rDrama.sql b/seed-emojis-rDrama.sql index cbe975920..c888e603f 100644 --- a/seed-emojis-rDrama.sql +++ b/seed-emojis-rDrama.sql @@ -3371,6 +3371,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags, nsfw, created_utc) VALUE ('marseymissingno','Marsey',2,'missing no missingno error marsey pokemon',false,1687128437), ('marseymisssize','Marsey',2,'slut pickme foid woman crazy insane society joker honk clown whore',false,1694259036), ('marseymlg','Marsey',2,'glasses moutaindew hat',false,1684032773), +('marseymlpowned','Marsey',2,'internetargumentswon mlp hardbody rottie pony ponies',false,1698334420), ('marseymobster2','Marsey',2,'bat gangster mafia kneecapper',false,NULL), ('marseymochi','Marsey',2,'cat marsey mochi grey gray cute adorable pet kitty kitten',false,1688926991), ('marseymocking','Marsey',2,'mocking spongebob meme alternating studly caps retard',false,NULL), @@ -4547,6 +4548,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags, nsfw, created_utc) VALUE ('marseyviewerstare','Marsey',2,'stare look expectant looking front frontstare ahead facingviewer',false,1694554942), ('marseyvirus','Marsey',2,'phage infect infection plagued',false,NULL), ('marseyvivec','Marsey',2,'videogame elderscrolls morrowind gamer monk',false,1681366601), +('marseyvivianjames','Marsey',2,'gamergate kotaku 4chan',false,1698335217), ('marseyvocaloid','Marsey',2,'vocaloid hatsunemiku miku hatsune marsey silly omg',false,1681284862), ('marseyvolpe','Marsey',2,'vope gas mask gasmask apocolypse',false,1688456734), ('marseyvore','Marsey',2,'eating cannibalism cannibalize fetish kinky digest trapped letmeout',false,NULL),