aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Xithrius <[email protected]>2021-04-11 10:50:36 -0700
committerGravatar GitHub <[email protected]>2021-04-11 10:50:36 -0700
commitb1bfea4a31fef5afb7a96ace166b1029a2a67f36 (patch)
treeee11db9a99554039432e9b1b4ba651048999c975
parentIssues: add `type=public` (diff)
parentMerge pull request #675 from python-discord/trashcan-can-now-be-overwritten-w... (diff)
Merge branch 'main' into akarys/630/automatic-linking-everywhere
-rw-r--r--bot/constants.py2
-rw-r--r--bot/resources/evergreen/starter.yaml1
2 files changed, 1 insertions, 2 deletions
diff --git a/bot/constants.py b/bot/constants.py
index e59fa641..a64882db 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -153,7 +153,7 @@ class Emojis:
christmas_tree = "\U0001F384"
check = "\u2611"
envelope = "\U0001F4E8"
- trashcan = "<:trashcan:637136429717389331>"
+ trashcan = environ.get("TRASHCAN_EMOJI", "<:trashcan:637136429717389331>")
ok_hand = ":ok_hand:"
hand_raised = "\U0001f64b"
diff --git a/bot/resources/evergreen/starter.yaml b/bot/resources/evergreen/starter.yaml
index 4fec6a10..6b0de0ef 100644
--- a/bot/resources/evergreen/starter.yaml
+++ b/bot/resources/evergreen/starter.yaml
@@ -6,7 +6,6 @@
- "What is better: Milk, Dark or White chocolate?"
- What is your favourite holiday?
- If you could have any superpower, what would it be?
-- Name one thing you like about a person to your right.
- If you could be anyone else for one day, who would it be?
- What Easter tradition do you enjoy most?
- What is the best gift you've been given?