Merge branch 'master' of https://fsdfsd.net/rDrama/rDrama

files/templates/rules_WPD.html

@@ -13,13 +13,13 @@
 <ul>
 <li>The <i>Discussion</i>, <i>Social</i>, and <i>Music</i> flairs are intentionally off-topic and do not require people dying.</li>
 <li>Videos that only include aftermath of a serious accident/incident or current event may be allowed.</li>
-<li>No animal death under any circumstances.</li>
-<li>ABSOLUTELY NO content featuring children. This is any person under 18 years old. No exceptions.</li>
+<li>No animal death unless there's also a human dying in the video.</li>
 </ul>
 </li>
 <li>Titles should be as descriptive as possible.
 <ul>
 <li>Additional context, images, or sources are always encouraged and appreciated. No joke titles please.</li>
+<li>If there is a child hurt or killed, please put "Child Warning" in the title.</li>
 </ul>
 </li>
 <li>No explicit racism or bigotry.

seed-db.sql

@@ -1816,6 +1816,8 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseydefenestration',2,'suicide window jump kill murder kms jump out window death die defenestrate',NULL),
 ('marseydemiurge',2,'gnostic gnosticism demiurge',NULL),
 ('marseydemonicgrin',2,'evil wicked horror teeth',NULL),
+('marseydenji',2,'denji anime chainsawman tatsuki fujimoto blonde uniform manga pochita',1674764569),
+('marseydenjishirtless',2,'denji anime chainsawman tatsuki fujimoto shirtless blonde uniform manga pochita',1674764521),
 ('marseydepressed',2,'smoke kms doomer cigarette despair reaction depression suicide suicidal smoking hopeless sad',NULL),
 ('marseyderanged',2,'crazy psycho mad disgusted angry rage violent baseball bat',NULL),
 ('marseyderp',2,'hehe teehee troll animated durr giggle',NULL),
@@ -1981,6 +1983,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyfingergoodjob',2,'cute encourage positive respect k-pop thumbs up congrats gif animated congratulations nice ok great',NULL),
 ('marseyfingerhearts',2,'cute love k-pop',NULL),
 ('marseyfingerwords',2,'cute long tldr didnt read',NULL),
+('marseyflaghongkong',2,'china chink chong asian taiwan island bong colony cantonese xenophobia mainland',1674741576),
 ('marseyflakes',2,'parsley seasoning salt pepper spice food seasoning',NULL),
 ('marseyflamethrower',2,'vietname soldier fire',NULL),
 ('marseyflamewar',2,'troll fight fire reaction gasoline',NULL),
@@ -1989,6 +1992,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyfluffy',2,'poofy cute shaggy happy smile excited scruffy',NULL),
 ('marseyfluffyannoyed',2,'angry mad cope seethe dilate cute fur sneed hairy',1674567634),
 ('marseyflushzoom',2,'flushed eyes bulging shocked surprised flustered waytoodank',NULL),
+('marseyflushzoomzoom',2,'blush shy owo uwu heartbeat pound eyes wide meek',1674705033),
 ('marseyflyingspaghettimonster',2,'atheist atheism flying religon science',1664491405),
 ('marseyfocault',2,'philosophy history',NULL),
 ('marseyfoidghost',2,'foid ghost frozenchosen womanundead halloween',1666378137),
@@ -2853,6 +2857,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseysamfisher',2,'spy night goggles thermal stealth soldier agent nsa army',1671071201),
 ('marseysamhyde',2,'gun shooter sammy mdegenerate milliondollarextreme million dollar extreme',NULL),
 ('marseysamhyde2',2,'gun shooter sammy mdegenerate milliondollarextreme million dollar extreme',NULL),
+('marseysamurai',2,'japan sword war weeb anime history',1674768702),
 ('marseysanders',2,'bernie rich socialism socialist jewish',NULL),
 ('marseysanta',2,'christmas gifts presents claus holiday',NULL),
 ('marseysanta2',2,'christmas gifts presents claus holiday',NULL),