diff --git a/files/assets/images/emojis/marseycarpupset.webp b/files/assets/images/emojis/marseycarpupset.webp new file mode 100644 index 000000000..f747eb37e Binary files /dev/null and b/files/assets/images/emojis/marseycarpupset.webp differ diff --git a/files/assets/images/emojis/marseycrying2.webp b/files/assets/images/emojis/marseycrying2.webp index 79bf7f048..e262398fc 100644 Binary files a/files/assets/images/emojis/marseycrying2.webp and b/files/assets/images/emojis/marseycrying2.webp differ diff --git a/files/assets/images/emojis/marseycutemad.webp b/files/assets/images/emojis/marseycutemad.webp new file mode 100644 index 000000000..8c87074d9 Binary files /dev/null and b/files/assets/images/emojis/marseycutemad.webp differ diff --git a/files/assets/images/emojis/marseyezramiller.webp b/files/assets/images/emojis/marseyezramiller.webp new file mode 100644 index 000000000..23c24faf8 Binary files /dev/null and b/files/assets/images/emojis/marseyezramiller.webp differ diff --git a/files/assets/images/emojis/marseygoatse.webp b/files/assets/images/emojis/marseygoatse.webp new file mode 100644 index 000000000..c004eedc8 Binary files /dev/null and b/files/assets/images/emojis/marseygoatse.webp differ diff --git a/files/assets/images/emojis/marseymagarentfree.webp b/files/assets/images/emojis/marseymagarentfree.webp new file mode 100644 index 000000000..64d6b674c Binary files /dev/null and b/files/assets/images/emojis/marseymagarentfree.webp differ diff --git a/files/assets/images/emojis/marseymidsommarchristian.webp b/files/assets/images/emojis/marseymidsommarchristian.webp new file mode 100644 index 000000000..0704b6787 Binary files /dev/null and b/files/assets/images/emojis/marseymidsommarchristian.webp differ diff --git a/files/assets/images/emojis/marseymidsommardani.webp b/files/assets/images/emojis/marseymidsommardani.webp new file mode 100644 index 000000000..01d4e08ab Binary files /dev/null and b/files/assets/images/emojis/marseymidsommardani.webp differ diff --git a/files/assets/images/emojis/marseyniggy.webp b/files/assets/images/emojis/marseyniggy.webp new file mode 100644 index 000000000..92ba989af Binary files /dev/null and b/files/assets/images/emojis/marseyniggy.webp differ diff --git a/files/assets/images/emojis/marseynoooticer.webp b/files/assets/images/emojis/marseynoooticer.webp new file mode 100644 index 000000000..926707c45 Binary files /dev/null and b/files/assets/images/emojis/marseynoooticer.webp differ diff --git a/files/assets/images/emojis/marseyupvote.webp b/files/assets/images/emojis/marseyupvote.webp new file mode 100644 index 000000000..27beabe01 Binary files /dev/null and b/files/assets/images/emojis/marseyupvote.webp differ diff --git a/files/assets/images/hats/Eazy-E Hat.webp b/files/assets/images/hats/Eazy-E Hat.webp new file mode 100644 index 000000000..117442774 Binary files /dev/null and b/files/assets/images/hats/Eazy-E Hat.webp differ diff --git a/files/assets/images/hats/Face Hugger.webp b/files/assets/images/hats/Face Hugger.webp new file mode 100644 index 000000000..f99e598a8 Binary files /dev/null and b/files/assets/images/hats/Face Hugger.webp differ diff --git a/files/assets/images/hats/Godots Visor.webp b/files/assets/images/hats/Godots Visor.webp new file mode 100644 index 000000000..f7c28d2c8 Binary files /dev/null and b/files/assets/images/hats/Godots Visor.webp differ diff --git a/files/assets/images/hats/Sawwed.webp b/files/assets/images/hats/Sawwed.webp new file mode 100644 index 000000000..c57780c66 Binary files /dev/null and b/files/assets/images/hats/Sawwed.webp differ diff --git a/files/assets/images/hats/Sleepy.webp b/files/assets/images/hats/Sleepy.webp new file mode 100644 index 000000000..ffea6af20 Binary files /dev/null and b/files/assets/images/hats/Sleepy.webp differ diff --git a/files/assets/images/hats/The Jason.webp b/files/assets/images/hats/The Jason.webp new file mode 100644 index 000000000..e7879493e Binary files /dev/null and b/files/assets/images/hats/The Jason.webp differ diff --git a/files/assets/images/hats/Webbed.webp b/files/assets/images/hats/Webbed.webp new file mode 100644 index 000000000..bee1bfd65 Binary files /dev/null and b/files/assets/images/hats/Webbed.webp differ diff --git a/seed-db.sql b/seed-db.sql index 3cc336637..25f8ae561 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -233,15 +233,14 @@ INSERT INTO public.hat_defs VALUES (733, 'Kanohi Ignika', 'The Mask of Life. Mat INSERT INTO public.hat_defs VALUES (734, 'Kanohi Pakari (Onua)', 'Toa of Earth. The wisdom of the group, but wisdom is useless if you don''t share it. Why is your element separate from Stone? Answer me that, wise guy!', 2, 500, NULL, 1663970191); INSERT INTO public.hat_defs VALUES (735, 'The Yakub', 'Proof that science has, in fact, gone too far', 2, 500, NULL, 1664054894); INSERT INTO public.hat_defs VALUES (737, 'Duel Wielding', 'Oh shit you''re packing? My bad carry on', 2, 500, NULL, 1664088304); - - INSERT INTO public.hat_defs VALUES (3, 'Cat Ears I', 'Mew :3', 2, 500, NULL, 1662167687); - - - - - - +INSERT INTO public.hat_defs VALUES (738, 'Godots Visor', '"An A-press is an A-press, you can''t say it''s only half." - TJ "Henry" Yoshi', 2, 500, NULL, 1664189703); +INSERT INTO public.hat_defs VALUES (741, 'Eazy-E Hat', 'BIPOCs wtih Attitude', 2, 500, NULL, 1664339102); +INSERT INTO public.hat_defs VALUES (743, 'Face Hugger', 'This thing bled acid! Who knows what it''s gonna'' do when it''s dead!', 2, 500, NULL, 1664402395); +INSERT INTO public.hat_defs VALUES (740, 'Sleepy', '...Please... ...Let me sleep... ...A little more... ...Please...', 2, 1000, NULL, 1664285288); +INSERT INTO public.hat_defs VALUES (744, 'Webbed', 'It isn''t cum on your face this time-Happy Halloween', 2, 500, NULL, 1664415784); +INSERT INTO public.hat_defs VALUES (745, 'The Jason', 'Slash away those filthy campers jason-Happy Halloween', 2, 500, NULL, 1664415825); +INSERT INTO public.hat_defs VALUES (746, 'Sawwed', 'Ouch you need an Advil?-Happy Halloween', 2, 500, NULL, 1664415857); INSERT INTO public.hat_defs VALUES (723, 'Hohol', 'Мій предок :)', 2, 500, NULL, 1663892328); INSERT INTO public.hat_defs VALUES (92, 'Top Hat (black)', 'Traditional. Classy. Elegant.', 2, 500, NULL, 1662167687); INSERT INTO public.hat_defs VALUES (714, 'Captain Falcon', 'The chad that every smash player wanted to imitate, if only his moveset included a shower.', 2, 500, NULL, 1663474615); @@ -1210,7 +1209,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseycarpprotest',2,'sign fish mad carpathianflorist sign admin jannie',1663163535), ('marseycarpsnipe',2,'shooter shooting gun sniper rifle scope crosshairs carpathianflorist kill murder bullet crosshair ajab',NULL), ('marseycarptrophy',2,'carp head decapitated anticarp trophy defeat dead teaparty',NULL), -('marseycarpupset',2,'carp upset',1664262142), +('marseycarpupset',2,'carpathianflorist administrator jannie janitor fish crying tears',1664262142), ('marseycarsuicide',2,'kms suicide kill death car vehicle carbon monoxide co muffler suffocation suffocate',NULL), ('marseycat',2,'fursona skin animal costume furry neko fursuit cat',NULL), ('marseycatgirl',2,'uwu waifu anime fursona furry owo weebshit fursuit',NULL),