\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | Not Ready | [LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)] \]
" - if(PLAYER_READY_TO_PLAY) - output += "\[ Ready | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | [LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)] \]
" - if(PLAYER_READY_TO_OBSERVE) - output += "\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | Observe \]
" - else - output += "" - output += "" - output += "[LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)]
" - - if(!IsGuestKey(src.key)) - output += playerpolls() - - output += "Show Player Polls (NEW!)
" - else - output += "" - qdel(query_get_new_polls) - if(QDELETED(src)) - return - return output - /mob/dead/new_player/Topic(href, href_list[]) if(src != usr) return @@ -121,61 +51,12 @@ if(client.interviewee) return FALSE - //Determines Relevent Population Cap - var/relevant_cap - var/hpc = CONFIG_GET(number/hard_popcap) - var/epc = CONFIG_GET(number/extreme_popcap) - if(hpc && epc) - relevant_cap = min(hpc, epc) - else - relevant_cap = max(hpc, epc) - - if(href_list["show_preferences"]) - client.prefs.ShowChoices(src) - return TRUE - - if(href_list["ready"]) - var/tready = text2num(href_list["ready"]) - //Avoid updating ready if we're after PREGAME (they should use latejoin instead) - //This is likely not an actual issue but I don't have time to prove that this - //no longer is required - if(SSticker.current_state <= GAME_STATE_PREGAME) - ready = tready - //if it's post initialisation and they're trying to observe we do the needful - if(!SSticker.current_state < GAME_STATE_PREGAME && tready == PLAYER_READY_TO_OBSERVE) - ready = tready - make_me_an_observer() - return - - if(href_list["refresh"]) - src << browse(null, "window=playersetup") //closes the player setup window - new_player_panel() - - if(href_list["late_join"]) + if(href_list["late_join"]) //This still exists for queue messages in chat if(!SSticker?.IsRoundInProgress()) to_chat(usr, span_boldwarning("The round is either not ready, or has already finished...")) return - - if(href_list["late_join"] == "override") - LateChoices() - return - - if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums))) - to_chat(usr, span_danger("[CONFIG_GET(string/hard_popcap_message)]")) - - var/queue_position = SSticker.queued_players.Find(usr) - if(queue_position == 1) - to_chat(usr, span_notice("You are next in line to join the game. You will be notified when a slot opens up.")) - else if(queue_position) - to_chat(usr, span_notice("There are [queue_position-1] players in front of you in the queue to join the game.")) - else - SSticker.queued_players += usr - to_chat(usr, span_notice("You have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].")) - return LateChoices() - - if(href_list["manifest"]) - ViewManifest() + return if(href_list["SelectedJob"]) if(!SSticker?.IsRoundInProgress()) @@ -186,6 +67,17 @@ to_chat(usr, span_notice("There is an administrative lock on entering the game!")) return + //Determines Relevent Population Cap + var/relevant_cap + var/hpc = CONFIG_GET(number/hard_popcap) + var/epc = CONFIG_GET(number/extreme_popcap) + if(hpc && epc) + relevant_cap = min(hpc, epc) + else + relevant_cap = max(hpc, epc) + + + if(SSticker.queued_players.len && !(ckey(key) in GLOB.admin_datums)) if((living_player_count() >= relevant_cap) || (src != SSticker.queued_players[1])) to_chat(usr, span_warning("Server is full.")) @@ -194,13 +86,6 @@ AttemptLateSpawn(href_list["SelectedJob"]) return - else if(!href_list["late_join"]) - new_player_panel() - - if(href_list["showpoll"]) - handle_player_polling() - return - if(href_list["viewpoll"]) var/datum/poll_question/poll = locate(href_list["viewpoll"]) in GLOB.polls poll_player(poll) @@ -223,7 +108,6 @@ if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") ready = PLAYER_NOT_READY src << browse(null, "window=playersetup") //closes the player setup window - new_player_panel() return FALSE var/mob/dead/observer/observer = new() @@ -270,14 +154,14 @@ /mob/dead/new_player/proc/IsJobUnavailable(rank, latejoin = FALSE) var/datum/job/job = SSjob.GetJob(rank) - if(!job) + if(!(job.job_flags & JOB_NEW_PLAYER_JOINABLE)) return JOB_UNAVAILABLE_GENERIC if((job.current_positions >= job.total_positions) && job.total_positions != -1) - if(job.title == "Assistant") + if(is_assistant_job(job)) if(isnum(client.player_age) && client.player_age <= 14) //Newbies can always be assistants return JOB_AVAILABLE - for(var/datum/job/J in SSjob.occupations) - if(J && J.current_positions < J.total_positions && J.title != job.title) + for(var/datum/job/other_job as anything in SSjob.joinable_occupations) + if(other_job.current_positions < other_job.total_positions && other_job != job) return JOB_UNAVAILABLE_SLOTFULL else return JOB_UNAVAILABLE_SLOTFULL @@ -299,7 +183,6 @@ tgui_alert(usr, get_job_unavailable_error_message(error, rank)) return FALSE - var/arrivals_docked = TRUE if(SSshuttle.arrivals) close_spawn_windows() //In case we get held up if(SSshuttle.arrivals.damaged && CONFIG_GET(flag/arrivals_shuttle_require_safe_latejoin)) @@ -308,37 +191,43 @@ if(CONFIG_GET(flag/arrivals_shuttle_require_undocked)) SSshuttle.arrivals.RequireUndocked(src) - arrivals_docked = SSshuttle.arrivals.mode != SHUTTLE_CALL //Remove the player from the join queue if he was in one and reset the timer SSticker.queued_players -= src SSticker.queue_delay = 4 - SSjob.AssignRole(src, rank, 1) + var/datum/job/job = SSjob.GetJob(rank) - var/mob/living/character = create_character(TRUE) //creates the human and transfers vars and mind + SSjob.AssignRole(src, job, TRUE) - var/is_captain = FALSE - // If we don't have an assigned cap yet, check if this person qualifies for some from of captaincy. - if(!SSjob.assigned_captain && ishuman(character) && SSjob.chain_of_command[rank] && !is_banned_from(ckey, list("Captain"))) - is_captain = TRUE - // If we already have a captain, are they a "Captain" rank and are we allowing multiple of them to be assigned? - else if(SSjob.always_promote_captain_job && (rank == "Captain")) - is_captain = TRUE + mind.late_joiner = TRUE + var/atom/destination = mind.assigned_role.get_latejoin_spawn_point() + if(!destination) + CRASH("Failed to find a latejoin spawn point.") + var/mob/living/character = create_character(destination) + if(!character) + CRASH("Failed to create a character for latejoin.") + transfer_character() SSjob.EquipRank(character, job, character.client) job.after_latejoin_spawn(character) - var/datum/job/job = SSjob.GetJob(rank) - - if(job && !job.override_latejoin_spawn(character)) - SSjob.SendToLateJoin(character) - if(!arrivals_docked) - var/atom/movable/screen/splash/Spl = new(character.client, TRUE) - Spl.Fade(TRUE) - character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25) - - character.update_parallax_teleport() + #define IS_NOT_CAPTAIN 0 + #define IS_ACTING_CAPTAIN 1 + #define IS_FULL_CAPTAIN 2 + var/is_captain = IS_NOT_CAPTAIN + // If we already have a captain, are they a "Captain" rank and are we allowing multiple of them to be assigned? + if(is_captain_job(job)) + is_captain = IS_FULL_CAPTAIN + // If we don't have an assigned cap yet, check if this person qualifies for some from of captaincy. + else if(!SSjob.assigned_captain && ishuman(character) && SSjob.chain_of_command[rank] && !is_banned_from(ckey, list("Captain"))) + is_captain = IS_ACTING_CAPTAIN + if(is_captain != IS_NOT_CAPTAIN) + minor_announce(job.get_captaincy_announcement(character)) + SSjob.promote_to_captain(character, is_captain == IS_ACTING_CAPTAIN) + #undef IS_NOT_CAPTAIN + #undef IS_ACTING_CAPTAIN + #undef IS_FULL_CAPTAIN SSticker.minds += character.mind character.client.init_verbs() // init verbs for the late join @@ -433,54 +322,37 @@ popup.set_content(jointext(dat, "")) popup.open(FALSE) // 0 is passed to open so that it doesn't use the onclose() proc -/mob/dead/new_player/proc/create_character(transfer_after) - spawning = 1 + +/// Creates, assigns and returns the new_character to spawn as. Assumes a valid mind.assigned_role exists. +/mob/dead/new_player/proc/create_character(atom/destination) + spawning = TRUE close_spawn_windows() - var/mob/living/carbon/human/H = new(loc) - - var/frn = CONFIG_GET(flag/force_random_names) - if(!frn) - frn = is_banned_from(ckey, "Appearance") - if(QDELETED(src)) - return - if(frn) - client.prefs.random_character() - client.prefs.real_name = client.prefs.pref_species.random_name(gender,1) - - var/is_antag - if(mind in GLOB.pre_setup_antags) - is_antag = TRUE - - client.prefs.copy_to(H, antagonist = is_antag, is_latejoiner = transfer_after) - - if(GLOB.current_anonymous_theme)//overrides random name because it achieves the same effect and is an admin enabled event tool - randomize_human(H) - H.fully_replace_character_name(null, GLOB.current_anonymous_theme.anonymous_name(H)) - - H.dna.update_dna_identity() - if(mind) - if(transfer_after) - mind.late_joiner = TRUE - mind.active = FALSE //we wish to transfer the key manually + mind.active = FALSE //we wish to transfer the key manually + var/mob/living/spawning_mob = mind.assigned_role.get_spawn_mob(client, destination) + if(QDELETED(src) || !client) + return // Disconnected while checking for the appearance ban. + if(!isAI(spawning_mob)) // Unfortunately there's still snowflake AI code out there. mind.original_character_slot_index = client.prefs.default_slot - mind.transfer_to(H) //won't transfer key since the mind is not active - mind.set_original_character(H) - - H.name = real_name + mind.transfer_to(spawning_mob) //won't transfer key since the mind is not active + mind.set_original_character(spawning_mob) client.init_verbs() - . = H + . = spawning_mob new_character = . - if(transfer_after) - transfer_character() + /mob/dead/new_player/proc/transfer_character() . = new_character - if(.) - new_character.key = key //Manually transfer the key to log them in, - new_character.stop_sound_channel(CHANNEL_LOBBYMUSIC) - new_character = null - qdel(src) + if(!.) + return + new_character.key = key //Manually transfer the key to log them in, + new_character.stop_sound_channel(CHANNEL_LOBBYMUSIC) + var/area/joined_area = get_area(new_character.loc) + if(joined_area) + joined_area.on_joining_game(new_character) + new_character = null + qdel(src) + /mob/dead/new_player/proc/ViewManifest() if(!client) diff --git a/icons/hud/lobby/background.dmi b/icons/hud/lobby/background.dmi new file mode 100644 index 00000000000..baae06fc1bd Binary files /dev/null and b/icons/hud/lobby/background.dmi differ diff --git a/icons/hud/lobby/bottom_buttons.dmi b/icons/hud/lobby/bottom_buttons.dmi new file mode 100644 index 00000000000..1407dfd597b Binary files /dev/null and b/icons/hud/lobby/bottom_buttons.dmi differ diff --git a/icons/hud/lobby/character_setup.dmi b/icons/hud/lobby/character_setup.dmi new file mode 100644 index 00000000000..ca81a5d7583 Binary files /dev/null and b/icons/hud/lobby/character_setup.dmi differ diff --git a/icons/hud/lobby/join.dmi b/icons/hud/lobby/join.dmi new file mode 100644 index 00000000000..217b8387257 Binary files /dev/null and b/icons/hud/lobby/join.dmi differ diff --git a/icons/hud/lobby/observe.dmi b/icons/hud/lobby/observe.dmi new file mode 100644 index 00000000000..e7e42b9c396 Binary files /dev/null and b/icons/hud/lobby/observe.dmi differ diff --git a/icons/hud/lobby/poll_overlay.dmi b/icons/hud/lobby/poll_overlay.dmi new file mode 100644 index 00000000000..2fc97162601 Binary files /dev/null and b/icons/hud/lobby/poll_overlay.dmi differ diff --git a/icons/hud/lobby/ready.dmi b/icons/hud/lobby/ready.dmi new file mode 100644 index 00000000000..d2a45a883f4 Binary files /dev/null and b/icons/hud/lobby/ready.dmi differ diff --git a/icons/runtime/default_title.dmi b/icons/runtime/default_title.dmi index 633bd434b8d..2f21e7f1624 100644 Binary files a/icons/runtime/default_title.dmi and b/icons/runtime/default_title.dmi differ diff --git a/interface/skin.dmf b/interface/skin.dmf index b616cd2c330..168dd6eb06c 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -116,17 +116,6 @@ window "mapwindow" right-click = true saved-params = "zoom;letterbox;zoom-mode" style = ".center { text-align: center; } .maptext { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .command_headset { font-weight: bold;\tfont-size: 8px; } .small { font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 6px; }" - elem "lobbybrowser" - type = BROWSER - pos = 0,0 - size = 640x480 - anchor1 = 0,0 - anchor2 = 100,100 - background-color = none - is-visible = false - is-disabled = true - saved-params = "" - auto-format = false elem "status_bar" type = LABEL pos = 0,464 diff --git a/modular_skyrat/master_files/code/_onclick/hud/new_player.dm b/modular_skyrat/master_files/code/_onclick/hud/new_player.dm new file mode 100644 index 00000000000..bc837eb6d55 --- /dev/null +++ b/modular_skyrat/master_files/code/_onclick/hud/new_player.dm @@ -0,0 +1,58 @@ +/atom/movable/screen/lobby/button/antag_toggle + icon = 'modular_skyrat/master_files/icons/hud/lobby/bottom_buttons.dmi' + icon_state = "be_antag_off" + base_icon_state = "be_antag_off" + screen_loc = "TOP:-122,CENTER:-26" + +/atom/movable/screen/lobby/button/antag_toggle/Click(location, control, params) + . = ..() + if(!.) + return + var/mob/dead/new_player/new_player = hud.mymob + new_player.client.prefs.be_antag = !new_player.client.prefs.be_antag + base_icon_state = "be_antag_[new_player.client.prefs.be_antag ? "on" : "off"]" + update_appearance(UPDATE_ICON) + to_chat(new_player, span_notice("You will now [new_player.client.prefs.be_antag ? "be considered" : "not be considered"] for any antagonist positions set in your preferences.")) + +/atom/movable/screen/lobby/button/antag_toggle/Initialize(mapload) + . = ..() + if(SSticker.current_state > GAME_STATE_PREGAME) + set_button_status(FALSE) + else + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, .proc/hide_ready_button) + +/atom/movable/screen/lobby/button/antag_toggle/proc/hide_ready_button() + SIGNAL_HANDLER + set_button_status(FALSE) + UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP) + +/atom/movable/screen/lobby/button/server_swap + icon = 'modular_skyrat/master_files/icons/hud/lobby/bottom_buttons.dmi' + icon_state = "server_swap" + base_icon_state = "server_swap" + screen_loc = "TOP:-122,CENTER:-54" + +/atom/movable/screen/lobby/button/server_swap/Click(location, control, params) + . = ..() + if(!.) + return + if(!CONFIG_GET(flag/server_swap_enabled)) + return + var/mob/dead/new_player/new_player = hud.mymob + if(GLOB.swappable_ips.len == 1) + var/server_name = GLOB.swappable_ips[1] + var/server_ip = GLOB.swappable_ips[server_name] + var/confirm = tgui_alert(new_player, "Are you sure you want to swap to [server_name] ([server_ip])?", "Swapping server!", list("Connect me!", "Stay here!")) + if(confirm == "Connect me!") + to_chat_immediate(new_player, "So long, spaceman.") + new_player.client << link(server_ip) + return + var/server_name = tgui_input_list(new_player, "Please select the server you wish to swap to:", "Swap servers!", GLOB.swappable_ips) + if(!server_name) + return + var/server_ip = GLOB.swappable_ips[server_name] + var/confirm = tgui_alert(new_player, "Are you sure you want to swap to [server_name] ([server_ip])?", "Swapping server!", list("Connect me!", "Stay here!")) + if(confirm == "Connect me!") + to_chat_immediate(new_player, "So long, spaceman.") + new_player.client << link(server_ip) + return diff --git a/modular_skyrat/master_files/code/modules/mob/living/dead/new_player/new_player.dm b/modular_skyrat/master_files/code/modules/mob/living/dead/new_player/new_player.dm index cad9472c395..cbf37eee2bd 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/dead/new_player/new_player.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/dead/new_player/new_player.dm @@ -1,10 +1,9 @@ -#define LINKIFY_READY(string, value) "[string]" - /mob/dead/new_player flags_1 = NONE invisibility = INVISIBILITY_ABSTRACT density = FALSE stat = DEAD + hud_type = /datum/hud/new_player hud_possible = list() var/ready = FALSE @@ -13,10 +12,9 @@ /// For instant transfer once the round is set up var/mob/living/new_character ///Used to make sure someone doesn't get spammed with messages if they're ineligible for roles. - //Used to make sure someone doesn't get spammed with messages if they're ineligible for roles var/ineligible_for_roles = FALSE - var/client/my_client + /mob/dead/new_player/Initialize() if(client && SSticker.state == GAME_STATE_STARTUP) @@ -42,220 +40,59 @@ /mob/dead/new_player/prepare_huds() return -/** - * This proc generates the panel that opens to all newly joining players, allowing them to join, observe, view polls, view the current crew manifest, and open the character customization menu. - */ -/mob/dead/new_player/proc/show_titlescreen() - if (client?.interviewee) +/mob/dead/new_player/Topic(href, href_list[]) + if(src != usr) return - winset(src, "lobbybrowser", "is-disabled=false;is-visible=true") - - - - var/datum/asset/assets = get_asset_datum(/datum/asset/simple/lobby) //Sending pictures to the client - assets.send(src) - - - - - - - - - - - - update_titlescreen() - - - - -/mob/dead/new_player/proc/update_titlescreen() - var/dat = get_lobby_html() - - src << browse(GLOB.current_lobby_screen, "file=titlescreen.gif;display=0") - src << browse(dat, "window=lobbybrowser") - -/datum/asset/simple/lobby - assets = list( - "FixedsysExcelsior3.01Regular.ttf" = 'html/browser/FixedsysExcelsior3.01Regular.ttf', - ) - -/mob/dead/new_player/proc/hide_titlescreen() - if(my_client.mob) - winset(my_client, "lobbybrowser", "is-disabled=true;is-visible=false") - -/mob/dead/new_player/proc/playerpolls() - var/output - if (SSdbcore.Connect()) - var/isadmin = FALSE - if(client?.holder) - isadmin = TRUE - var/datum/db_query/query_get_new_polls = SSdbcore.NewQuery({" - SELECT id FROM [format_table_name("poll_question")] - WHERE (adminonly = 0 OR :isadmin = 1) - AND Now() BETWEEN starttime AND endtime - AND deleted = 0 - AND id NOT IN ( - SELECT pollid FROM [format_table_name("poll_vote")] - WHERE ckey = :ckey - AND deleted = 0 - ) - AND id NOT IN ( - SELECT pollid FROM [format_table_name("poll_textreply")] - WHERE ckey = :ckey - AND deleted = 0 - ) - "}, list("isadmin" = isadmin, "ckey" = ckey)) - - if(!query_get_new_polls.Execute()) - qdel(query_get_new_polls) - return - if(query_get_new_polls.NextRow()) - output +={"POLLS (NEW)"} - else - output +={"POLLS"} - qdel(query_get_new_polls) - if(QDELETED(src)) - return - return output - -/mob/dead/new_player/Topic(href, href_list[]) - if(src != usr || !client) - - - + if(!client) return if(client.interviewee) return FALSE - //Determines Relevent Population Cap - var/relevant_cap - var/hpc = CONFIG_GET(number/hard_popcap) - var/epc = CONFIG_GET(number/extreme_popcap) - if(hpc && epc) - relevant_cap = min(hpc, epc) - else - relevant_cap = max(hpc, epc) - - if(href_list["lobby_setup"]) - client.prefs.needs_update = TRUE - client.prefs.ShowChoices(src) - return TRUE - - if(href_list["lobby_ready"]) - if(!client.prefs.check_flavor_text()) - ready = PLAYER_NOT_READY - return - - if(SSticker.current_state <= GAME_STATE_PREGAME) - client << output(null, "lobbybrowser:imgsrc") - ready = !ready - return - - if(href_list["lobby_observe"]) - ready = PLAYER_READY_TO_OBSERVE - hide_titlescreen() - make_me_an_observer() - return - - if(href_list["lobby_antagtoggle"]) - client.prefs.be_antag = !client.prefs.be_antag - update_titlescreen() - to_chat(usr, "You will now [client.prefs.be_antag ? "be considered" : "not be considered"] for any antagonist positions set in your preferences.") - return - - if(href_list["lobby_swap"]) - if(!CONFIG_GET(flag/server_swap_enabled)) - return - if(GLOB.swappable_ips.len == 1) - var/server_name = GLOB.swappable_ips[1] - var/server_ip = GLOB.swappable_ips[server_name] - var/confirm = tgui_alert(usr, "Are you sure you want to swap to [server_name] ([server_ip])?", "Swapping server!", list("Connect me!", "Stay here!")) - if(confirm == "Connect me!") - to_chat_immediate(src, "So long, spaceman.") - client << link(server_ip) - return - var/server_name = tgui_input_list(usr, "Please select the server you wish to swap to:", "Swap servers!", GLOB.swappable_ips) - if(!server_name) - return - var/server_ip = GLOB.swappable_ips[server_name] - var/confirm = tgui_alert(usr, "Are you sure you want to swap to [server_name] ([server_ip])?", "Swapping server!", list("Connect me!", "Stay here!")) - if(confirm == "Connect me!") - to_chat_immediate(src, "So long, spaceman.") - client << link(server_ip) - return - - if(href_list["lobby_join"]) - if(!client.prefs.check_flavor_text()) - return - - + if(href_list["late_join"]) //This still exists for queue messages in chat if(!SSticker?.IsRoundInProgress()) - to_chat(usr, "The round is either not ready, or has already finished...") - return - - if(href_list["lobby_join"] == "override") - LateChoices() - return - - if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums))) - to_chat(usr, "[CONFIG_GET(string/hard_popcap_message)]") - - var/queue_position = SSticker.queued_players.Find(usr) - if(queue_position == 1) - to_chat(usr, "You are next in line to join the game. You will be notified when a slot opens up.") - else if(queue_position) - to_chat(usr, "There are [queue_position-1] players in front of you in the queue to join the game.") - else - SSticker.queued_players += usr - to_chat(usr, "You have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].") + to_chat(usr, span_boldwarning("The round is either not ready, or has already finished...")) return LateChoices() - - if(href_list["lobby_crew"]) - ViewManifest() return - if(href_list["SelectedJob"]) - if(!client.prefs.check_flavor_text()) - return - if(!SSticker?.IsRoundInProgress()) - to_chat(usr, "The round is either not ready, or has already finished...") + to_chat(usr, span_danger("The round is either not ready, or has already finished...")) return if(SSlag_switch.measures[DISABLE_NON_OBSJOBS]) - to_chat(usr, "There is an administrative lock on entering the game!") + to_chat(usr, span_notice("There is an administrative lock on entering the game!")) return + //Determines Relevent Population Cap + var/relevant_cap + var/hpc = CONFIG_GET(number/hard_popcap) + var/epc = CONFIG_GET(number/extreme_popcap) + if(hpc && epc) + relevant_cap = min(hpc, epc) + else + relevant_cap = max(hpc, epc) + + + if(SSticker.queued_players.len && !(ckey(key) in GLOB.admin_datums)) if((living_player_count() >= relevant_cap) || (src != SSticker.queued_players[1])) - to_chat(usr, "Server is full.") + to_chat(usr, span_warning("Server is full.")) return AttemptLateSpawn(href_list["SelectedJob"]) return - - - - if(href_list["showpoll"]) - handle_player_polling() - return - if(href_list["viewpoll"]) var/datum/poll_question/poll = locate(href_list["viewpoll"]) in GLOB.polls poll_player(poll) - return if(href_list["votepollref"]) var/datum/poll_question/poll = locate(href_list["votepollref"]) in GLOB.polls vote_on_poll_handler(poll, href_list) - return + //When you cop out of the round (NB: this HAS A SLEEP FOR PLAYER INPUT IN IT) /mob/dead/new_player/proc/make_me_an_observer() @@ -270,8 +107,7 @@ if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") ready = PLAYER_NOT_READY - show_titlescreen() - + src << browse(null, "window=playersetup") //closes the player setup window return FALSE var/mob/dead/observer/observer = new() @@ -280,11 +116,11 @@ observer.started_as_observer = TRUE close_spawn_windows() var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list - to_chat(src, "Now teleporting.") + to_chat(src, span_notice("Now teleporting.")) if (O) observer.forceMove(O.loc) else - to_chat(src, "Teleporting failed. Ahelp an admin please") + to_chat(src, span_notice("Teleporting failed. Ahelp an admin please")) stack_trace("There's no freaking observer landmark available on this map or you're making observers before the map is initialised") observer.key = key observer.client = client @@ -568,7 +404,7 @@ /mob/dead/new_player/proc/close_spawn_windows() src << browse(null, "window=latechoices") //closes late choices window - hide_titlescreen() //closes the player setup window + src << browse(null, "window=playersetup") //closes the player setup window src << browse(null, "window=preferences") //closes job selection src << browse(null, "window=mob_occupation") src << browse(null, "window=latechoices") //closes late job selection @@ -589,7 +425,7 @@ has_antags = TRUE if(client.prefs.job_preferences.len == 0) if(!ineligible_for_roles) - to_chat(src, "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.") + to_chat(src, span_danger("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.")) ineligible_for_roles = TRUE ready = PLAYER_NOT_READY if(has_antags) diff --git a/modular_skyrat/master_files/icons/hud/lobby/bottom_buttons.dmi b/modular_skyrat/master_files/icons/hud/lobby/bottom_buttons.dmi new file mode 100644 index 00000000000..990a6d1bc17 Binary files /dev/null and b/modular_skyrat/master_files/icons/hud/lobby/bottom_buttons.dmi differ diff --git a/modular_skyrat/master_files/sound/effects/save.ogg b/modular_skyrat/master_files/sound/effects/save.ogg new file mode 100644 index 00000000000..fb296943056 Binary files /dev/null and b/modular_skyrat/master_files/sound/effects/save.ogg differ diff --git a/modular_skyrat/modules/customization/modules/client/preferences.dm b/modular_skyrat/modules/customization/modules/client/preferences.dm index f6d0bd27e5f..b2e7f5d9ede 100644 --- a/modular_skyrat/modules/customization/modules/client/preferences.dm +++ b/modular_skyrat/modules/customization/modules/client/preferences.dm @@ -3038,10 +3038,6 @@ GLOBAL_LIST_INIT(food, list( else needs_update = TRUE - if(istype(parent.mob, /mob/dead/new_player)) //is this shitcode? probably - I DONT CAREEE~ - var/mob/dead/new_player/NP = parent.mob - NP.show_titlescreen() - if("tab") if (href_list["tab"]) current_tab = text2num(href_list["tab"]) diff --git a/modular_skyrat/modules/lobbyscreen/code/change_titlescreen.dm b/modular_skyrat/modules/lobbyscreen/code/change_titlescreen.dm deleted file mode 100644 index d4f0c5a7a63..00000000000 --- a/modular_skyrat/modules/lobbyscreen/code/change_titlescreen.dm +++ /dev/null @@ -1,40 +0,0 @@ -/client/proc/change_title_screen() - set category = "Admin.Fun" - set name = "Title Screen: Change" - - if(!check_rights(R_FUN)) - return - - log_admin("[key_name(usr)] is changing the titlescreen.") - message_admins("[key_name_admin(usr)] is changing the titlescreen.") - - switch(alert(usr, "Please select a new titlescreen.", "Title Screen", "Change", "Reset", "Cancel")) - if("Change") - var/file = input(usr) as icon|null - if(!file) - return - change_lobbyscreen(file) - if("Reset") - change_lobbyscreen() - if("Cancel") - return - -/client/proc/change_title_screen_notice() - set category = "Admin.Fun" - set name = "Title Screen: Set Notice" - - if(!check_rights(R_FUN)) - return - - log_admin("[key_name(usr)] is setting the titlescreen notice.") - message_admins("[key_name_admin(usr)] is setting the titlescreen notice.") - - var/new_notice = input(usr, "Please input a notice to be displayed on the titlescreen:", "Titlescreen Notice") - if(!new_notice) - set_titlescreen_notice() - return - set_titlescreen_notice(new_notice) - for(var/mob/dead/new_player/N in GLOB.new_player_list) - to_chat(N, "TITLE NOTICE UPDATED: [new_notice]") - SEND_SOUND(N, sound('modular_skyrat/modules/admin/sound/duckhonk.ogg')) - diff --git a/modular_skyrat/modules/lobbyscreen/code/load_servers.dm b/modular_skyrat/modules/lobbyscreen/code/load_servers.dm index b641ed67c77..ccd6b72a2b6 100644 --- a/modular_skyrat/modules/lobbyscreen/code/load_servers.dm +++ b/modular_skyrat/modules/lobbyscreen/code/load_servers.dm @@ -28,6 +28,6 @@ SUBSYSTEM_DEF(serverswap) var/server_name = L[1] var/IP = L[2] GLOB.swappable_ips[server_name] = IP - add_startupmessage("SERVER SWAP: [server_name] loaded with IP: [IP]!") + to_chat(world, span_boldannounce("SERVER SWAP: [server_name] loaded with IP: [IP]!")) return ..() diff --git a/modular_skyrat/modules/lobbyscreen/code/lobby.dm b/modular_skyrat/modules/lobbyscreen/code/lobby.dm deleted file mode 100644 index b790e220f7c..00000000000 --- a/modular_skyrat/modules/lobbyscreen/code/lobby.dm +++ /dev/null @@ -1,87 +0,0 @@ -GLOBAL_LIST_EMPTY(startup_messages) -// FOR MOR INFO ON HTML CUSTOMISATION, SEE: https://github.com/Skyrat-SS13/Skyrat-tg/pull/4783 -/mob/dead/new_player/proc/get_lobby_html() - var/dat = GLOB.lobby_html - if(SSticker.current_state == GAME_STATE_STARTUP) - dat += {"
"}
- dat += {"
- "}
-
- if(GLOB.current_lobbyscreen_notice)
- dat += {"
-