From 4ce63de343d084a9eea7f72629d735c91812890d Mon Sep 17 00:00:00 2001
From: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Date: Fri, 29 Dec 2023 17:09:46 +0100
Subject: [PATCH] [s] Fix a Syndicate Bundle oversight (#23675)

* Fix syndicate bundle inputs staying valid for too long

* Cleanup + readability

* Grammar police weewoo
---
 code/game/objects/items/devices/radio/beacon.dm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index f78588a832e..b5ee0089fa4 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -81,19 +81,22 @@
 /obj/item/radio/beacon/syndicate/bundle/attack_self(mob/user)
 	if(!user)
 		return
+
 	if(!length(selected))
 		unselected = bundles.Copy()
 		for(var/i in 1 to 3)
 			selected += pick_n_take(unselected)
 		selected += "Random"
-	var/bundle_name  = tgui_input_list(user, "Available Bundles", "Bundle Selection", selected)
-	if(!bundle_name)
+
+	var/bundle_name = tgui_input_list(user, "Available Bundles", "Bundle Selection", selected)
+	if(!bundle_name || QDELETED(src))
 		return
+
 	if(bundle_name == "Random")
 		bundle_name = pick(unselected)
 	var/bundle = bundles[bundle_name]
 	bundle = new bundle(user.loc)
-	to_chat(user, "<span class='notice'>Welcome to [station_name()], [bundle_name]</span>")
+	to_chat(user, "<span class='notice'>Welcome to [station_name()], [bundle_name]!</span>")
 	user.drop_item()
 	qdel(src)
 	user.put_in_hands(bundle)