From 9248ec15da8707496deebdedc1c86696091953e1 Mon Sep 17 00:00:00 2001
From: VerySoft <a.roaming.shadow@gmail.com>
Date: Wed, 28 Dec 2022 18:53:04 -0500
Subject: [PATCH] Maint pred cancel tweak

should fix #12034
---
 .../objects/structures/ghost_pods/event_vr.dm | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm
index cc7cf8379a1..d6e4a1a0215 100644
--- a/code/game/objects/structures/ghost_pods/event_vr.dm
+++ b/code/game/objects/structures/ghost_pods/event_vr.dm
@@ -10,6 +10,7 @@
 	invisibility = INVISIBILITY_OBSERVER
 	spawn_active = TRUE
 	var/announce_prob = 35
+	var/randomize = FALSE
 	var/list/possible_mobs = list("Rabbit" = /mob/living/simple_mob/vore/rabbit,
 								  "Red Panda" = /mob/living/simple_mob/vore/redpanda,
 								  "Fennec" = /mob/living/simple_mob/vore/fennec,
@@ -48,23 +49,33 @@
 /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)
 	..()
 	var/choice
-	var/randomize
 	var/finalized = "No"
 
+	if(randomize)
+		choice = pick(possible_mobs)
+		finalized = "Yes"
+
 	while(finalized == "No" && M.client)
 		if(jobban_isbanned(M, "GhostRoles"))
 			to_chat(M, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
 			return
 		choice = tgui_input_list(M, "What type of predator do you want to play as?", "Maintpred Choice", possible_mobs)
 		if(!choice)
-			randomize = TRUE
-			break
+			to_chat(M, "<span class='notice'>No mob selected, cancelling.</span>")
+			active_ghost_pods |= src
+			used = FALSE
+			busy = FALSE
+			return
 
 		if(choice)
 			finalized = tgui_alert(M, "Are you sure you want to play as [choice]?","Confirmation",list("No","Yes"))
 
-	if(randomize)
-		choice = pick(possible_mobs)
+	if(!choice)
+		to_chat(M, "<span class='notice'>No mob selected, cancelling.</span>")
+		active_ghost_pods |= src
+		used = FALSE
+		busy = FALSE
+		return
 
 	var/mobtype = possible_mobs[choice]
 	var/mob/living/simple_mob/newPred = new mobtype(get_turf(src))
@@ -117,4 +128,4 @@
 	qdel(src)
 
 /obj/structure/ghost_pod/ghost_activated/morphspawn/no_announce
-	announce_prob = 0
\ No newline at end of file
+	announce_prob = 0