diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index b547f91ad4..ebb46fce17 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -1,3 +1,8 @@ +/obj/structure/ghost_pod/proc/reset_ghostpod() //Makes the ghost pod usable again and re-adds it to the active ghost pod list if it is not on it. + active_ghost_pods |= src + used = FALSE + busy = FALSE + /obj/structure/ghost_pod/ghost_activated/maintpred name = "maintenance hole" desc = "Looks like some creature dug its way into station's maintenance..." @@ -61,25 +66,34 @@ /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) ..() var/choice - var/randomize var/finalized = "No" + if(jobban_isbanned(M, "GhostRoles")) + to_chat(M, "You cannot inhabit this creature because you are banned from playing ghost roles.") + reset_ghostpod() + return + while(finalized == "No" && M.client) - if(jobban_isbanned(M, "GhostRoles")) - to_chat(M, "You cannot inhabit this creature because you are banned from playing ghost roles.") - return choice = tgui_input_list(M, "What type of predator do you want to play as?", "Maintpred Choice", possible_mobs) +<<<<<<< HEAD if(!choice) // randomize = TRUE //CHOMP remove FUCK OFF. When I press cancel I expect to cancel. used = FALSE //CHOMP add 200 IQ busy = FALSE //CHOMP add 201 IQ break +======= + if(!choice) //We probably pushed the cancel button on the mob selection. Let's just put the ghost pod back in the list. + to_chat(M, "No mob selected, cancelling.") + reset_ghostpod() + return +>>>>>>> a694901ce2... Merge pull request #14262 from Very-Soft/damob 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) //If somehow we ended up here and we don't have a choice, let's just reset things! + reset_ghostpod() + return var/mobtype = possible_mobs[choice] var/mob/living/simple_mob/newPred = new mobtype(get_turf(src))