From 0f6cb572765fdf39d33025adab3f95e38ea3e003 Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Wed, 8 Mar 2023 18:56:58 +0000 Subject: [PATCH] Prevents readying up in invalid state (#20240) * prevents readying up in invalid state * return * lets you cancel but not ready up --- code/modules/mob/new_player/new_player.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index fa711c9d5e7..ccf8c147d74 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -156,6 +156,11 @@ if(client.version_blocked) client.show_update_notice() return FALSE + if(!ready && !client.prefs.active_character.check_any_job() && (client.prefs.active_character.alternate_option == RETURN_TO_LOBBY)) + to_chat(usr, "You have no jobs enabled, along with return to lobby if job is unavailable. This makes you ineligible for any round start role, please update your job preferences.") + ready = FALSE + return FALSE + ready = !ready new_player_panel_proc()