From 7eb00e8f6128b0aa752ade74528e9e5fb9095813 Mon Sep 17 00:00:00 2001
From: Anson Chung <58066418+anscg@users.noreply.github.com>
Date: Fri, 29 May 2026 15:46:07 +0000
Subject: [PATCH 1/2] tweak fallout flow so people start as full members

---
 app/models/onboarding_scenarios/fallout.rb | 4 ++--
 config/slack_channels.yml                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/onboarding_scenarios/fallout.rb b/app/models/onboarding_scenarios/fallout.rb
index 92d92e2b..0d4f0c41 100644
--- a/app/models/onboarding_scenarios/fallout.rb
+++ b/app/models/onboarding_scenarios/fallout.rb
@@ -10,9 +10,9 @@ def form_fields
       [ :first_name, :last_name, :primary_email, :birthday, :country ]
     end
 
-    def slack_user_type = :multi_channel_guest
+    def slack_user_type = :full_member
 
-    def slack_channels = chans(:fallout, :fallout_help, :fallout_bulletin, :identity_help, :help)
+    def slack_channels = chans(:fallout, :fallout_help, :fallout_bulletin, :identity_help, :help, :hardware, :announcements, :electronics)
 
     def slack_onboarding_flow = :internal_tutorial
 
diff --git a/config/slack_channels.yml b/config/slack_channels.yml
index 0155fe3b..d7468391 100644
--- a/config/slack_channels.yml
+++ b/config/slack_channels.yml
@@ -44,6 +44,7 @@ shared:
   campfire: C09PXLPEL2Y
   campfire_bulletin: C0ACNAFBML4
   campfire_help: C09QNE26P7A
+  electronics: C056AMWSFKJ
   fallout: C037157AL30
   fallout_bulletin: C0ACG0XQWGN
   fallout_help: C0ACJ290090

From 9e98c7b3ef8a0b8fb7226fda9f159cbb9ef34ea9 Mon Sep 17 00:00:00 2001
From: Anson Chung <58066418+anscg@users.noreply.github.com>
Date: Fri, 29 May 2026 15:51:17 +0000
Subject: [PATCH 2/2] tweak wordings

---
 .../tutorial/fallout/03_welcome.slack_message.slocks | 12 ++++++++++--
 .../tutorial/fallout/intro.slack_message.slocks      |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/slack/tutorial/fallout/03_welcome.slack_message.slocks b/app/views/slack/tutorial/fallout/03_welcome.slack_message.slocks
index f2f0338f..f0d3aad4 100644
--- a/app/views/slack/tutorial/fallout/03_welcome.slack_message.slocks
+++ b/app/views/slack/tutorial/fallout/03_welcome.slack_message.slocks
@@ -33,9 +33,17 @@ when 1
   header "✨ you're already in!"
 
   section <<~TEXT, markdown: true
-    Oh! Um, it looks like you're already a full member of Hack Club! That's wonderful!
-
     I'm so glad you're here. How have you been enjoying the community? Have you made any new friends yet?
+
+    Visit <##{chan_welcome_to_hc}> for questions, advice, or just to introduce yourself!
+
+    For Fallout related things:
+
+    *<##{chan_fallout}>* - The main Fallout channel
+
+    *<##{chan_fallout_bulletin}>* - Channel for Fallout announcements
+
+    *<##{chan_fallout_help}>* - Channel to ask for Fallout related help
   TEXT
 
   divider
diff --git a/app/views/slack/tutorial/fallout/intro.slack_message.slocks b/app/views/slack/tutorial/fallout/intro.slack_message.slocks
index 64d98db6..1c19c42f 100644
--- a/app/views/slack/tutorial/fallout/intro.slack_message.slocks
+++ b/app/views/slack/tutorial/fallout/intro.slack_message.slocks
@@ -1,8 +1,8 @@
 image "https://cdn.hackclub.com/019cf72b-780f-75f6-bce2-cab2908116c2/welcome-to-fallout.gif", "Welcome to Hack Club Fallout!"
 
 section <<~EOFD, markdown: true
-  Right now you can only see a few channels related to Fallout.
-  To access other channels, you must read and agree to our <https://hackclub.com/conduct|Code of Conduct>.
+  Hey yo! Welcome to the Hack Club Slack!
+  Before you dive in, please read and agree to our <https://hackclub.com/conduct|Code of Conduct>.
 EOFD
 
 actions [