Merge branch 'spooky-22' of https://github.com/Aevann1/rDrama into spooky-22

files/routes/awards.py

@@ -213,7 +213,7 @@ def award_thing(v, thing_type, id):
 	if v.id != author.id:
 		safe_username = "👻" if thing.ghost else f"@{author.username}"
 		
-		if author.deflector and v.deflector:
+		if author.deflector and v.deflector and AWARDS[kind]['deflectable']:
 			msg = f"@{v.username} has tried to give your [{thing_type}]({thing.shortlink}) the {AWARDS[kind]['title']} Award but it was deflected on them, they also had a deflector up, so it bounced back and forth until it vaporized!"
 			send_repeatable_notification(author.id, msg)
 

seed-db.sql

@@ -2482,7 +2482,6 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseysachiko',2,'idolmaster anime animegirl niggy',1667212045),
 ('marseysad',2,'concerned worried waiting prepared reaction',NULL),
 ('marseysad2',2,'reaction disappointed disappointment upset',NULL),
-('marseysadbox',2,'marsey sad sadge cry crying frown juicebox juice box ball',1666587468),
 ('marseysadcat',2,'upset disappointing disappointment reaction disappointed sad crying',NULL),
 ('marseysadge',2,'frog pepe',NULL),
 ('marseysadgun',2,'pepe mellokind crying tears suicidal suicide kms frog',NULL),