Setup Character([client.prefs.real_name])
") //SKYRAT EDIT CHANGE - ORIGINAL: var/list/output = list("\[ 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 \]
" - output += "Be antagonist: [client.prefs.be_antag ? "Enabled" : "Disabled"]
" //SKYRAT EDIT ADDITION - output += "Be midround antagonist: [(client.prefs.toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]
" //SKYRAT EDIT ADDITION else output += "" output += "" output += "[LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)]
" - output += "Be Latejoin Antagonist: [client.prefs.be_antag ? "Enabled" : "Disabled"]
" //SKYRAT EDIT ADDITION - output += "Be Midround Antagonist: [(client.prefs.toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]
" //SKYRAT EDIT ADDITION if(!IsGuestKey(src.key)) output += playerpolls() @@ -133,7 +130,6 @@ relevant_cap = max(hpc, epc) if(href_list["show_preferences"]) - client.prefs.needs_update = TRUE //SKYRAT EDIT ADDITION - CUSTOMIZATION client.prefs.ShowChoices(src) return TRUE @@ -154,18 +150,6 @@ src << browse(null, "window=playersetup") //closes the player setup window new_player_panel() - //SKYRAT EDIT ADDITION BEGIN - if(href_list["antagtoggle"]) - client.prefs.be_antag = !client.prefs.be_antag - to_chat(usr, "You will now [client.prefs.be_antag ? "be considered" : "not be considered"] for any antagonist positions set in your preferences.") - new_player_panel() - - if(href_list["midroundantag"]) - client.prefs.toggles ^= MIDROUND_ANTAG - to_chat(usr, "You will now [(client.prefs.toggles & MIDROUND_ANTAG) ? "be considered" : "not be considered"] for any midround antagonist opportunities.") - new_player_panel() - //SKYRAT EDIT END - if(href_list["late_join"]) if(!SSticker?.IsRoundInProgress()) to_chat(usr, "The round is either not ready, or has already finished...") @@ -278,12 +262,6 @@ return "Your account is not old enough for [jobtitle]." if(JOB_UNAVAILABLE_SLOTFULL) return "[jobtitle] is already filled to capacity." - //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION - if(JOB_UNAVAILABLE_QUIRK) - return "[jobtitle] is restricted from your quirks." - if(JOB_UNAVAILABLE_SPECIES) - return "[jobtitle] is restricted from your species." - //SKYRAT EDIT END return "Error: Unknown job availability." /mob/dead/new_player/proc/IsJobUnavailable(rank, latejoin = FALSE) @@ -307,12 +285,6 @@ return JOB_UNAVAILABLE_ACCOUNTAGE if(job.required_playtime_remaining(client)) return JOB_UNAVAILABLE_PLAYTIME - //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION - if(job.has_banned_quirk(client.prefs)) - return JOB_UNAVAILABLE_QUIRK - if(job.has_banned_species(client.prefs)) - return JOB_UNAVAILABLE_SPECIES - //SKYRAT EDIT END if(latejoin && !job.special_check_latejoin(client)) return JOB_UNAVAILABLE_GENERIC return JOB_AVAILABLE @@ -372,15 +344,6 @@ SSticker.minds += character.mind character.client.init_verbs() // init verbs for the late join var/mob/living/carbon/human/humanc - - //SKRYAT EDIT ADDITION BEGIN - ASSAULTOPS - if(SSticker.mode.name == "assaultops") - if(is_assaultops_target(character.mind)) - remove_assaultops_target(character.mind, original=TRUE) - if(check_assaultops_target(character)) - add_assaultops_target(character, notify_target = TRUE) - //SKYRAT EDIT ADDITION END - if(ishuman(character)) humanc = character //Let's retypecast the var to be human, @@ -426,9 +389,6 @@ /mob/dead/new_player/proc/LateChoices() var/list/dat = list("Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]
")
- //SKYRAT EDIT ADDITION BEGIN - ALERTS
- dat += "Alert Level: [capitalize(num2seclevel(GLOB.security_level))]
"
- //SKYRAT EDIT END
if(SSshuttle.emergency)
switch(SSshuttle.emergency.mode)
if(SHUTTLE_ESCAPE)
@@ -599,3 +559,4 @@
// Add verb for re-opening the interview panel, and re-init the verbs for the stat panel
add_verb(src, /mob/dead/new_player/proc/open_interview)
+*/
diff --git a/html/browser/FixedsysExcelsior3.01Regular.ttf b/html/browser/FixedsysExcelsior3.01Regular.ttf
new file mode 100644
index 00000000000..a4f177c41a8
Binary files /dev/null and b/html/browser/FixedsysExcelsior3.01Regular.ttf differ
diff --git a/html/browser/TerminusTTFWindows-4.47.0.ttf b/html/browser/TerminusTTFWindows-4.47.0.ttf
new file mode 100644
index 00000000000..180b60d3158
Binary files /dev/null and b/html/browser/TerminusTTFWindows-4.47.0.ttf differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 168dd6eb06c..b616cd2c330 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -116,6 +116,17 @@ 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/modules/mob/living/dead/new_player/new_player.dm b/modular_skyrat/master_files/code/modules/mob/living/dead/new_player/new_player.dm
new file mode 100644
index 00000000000..259226694c7
--- /dev/null
+++ b/modular_skyrat/master_files/code/modules/mob/living/dead/new_player/new_player.dm
@@ -0,0 +1,572 @@
+#define LINKIFY_READY(string, value) "[string]"
+
+/mob/dead/new_player
+ var/ready = 0
+ var/spawning = 0//Referenced when you want to delete the new_player later on in the code.
+
+ flags_1 = NONE
+
+ invisibility = INVISIBILITY_ABSTRACT
+
+ density = FALSE
+ stat = DEAD
+ hud_possible = list()
+
+ var/mob/living/new_character //for instant transfer once the round is set up
+
+ //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)
+ var/atom/movable/screen/splash/S = new(client, TRUE, TRUE)
+ S.Fade(TRUE)
+
+ if(length(GLOB.newplayer_start))
+ forceMove(pick(GLOB.newplayer_start))
+ else
+ forceMove(locate(1,1,1))
+
+ ComponentInitialize()
+
+ . = ..()
+
+ GLOB.new_player_list += src
+
+/mob/dead/new_player/Destroy()
+ GLOB.new_player_list -= src
+ return ..()
+
+/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)
+ 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!"}
+ 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)
+ 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(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_join"])
+ 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].")
+ return
+ LateChoices()
+
+ if(href_list["lobby_crew"])
+ ViewManifest()
+ return
+
+
+ if(href_list["SelectedJob"])
+ if(!SSticker?.IsRoundInProgress())
+ to_chat(usr, "The round is either not ready, or has already finished...")
+ return
+
+ if(!GLOB.enter_allowed)
+ to_chat(usr, "There is an administrative lock on entering the game!")
+ return
+
+ 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.")
+ 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)
+
+ if(href_list["votepollref"])
+ var/datum/poll_question/poll = locate(href_list["votepollref"]) in GLOB.polls
+ vote_on_poll_handler(poll, href_list)
+
+ if(href_list["lobby_changelog"])
+ client.changelog()
+
+//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()
+ if(QDELETED(src) || !src.client)
+ ready = PLAYER_NOT_READY
+ return FALSE
+
+ var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No")
+
+ if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes")
+ ready = PLAYER_NOT_READY
+ show_titlescreen()
+ return FALSE
+
+ var/mob/dead/observer/observer = new()
+ spawning = TRUE
+
+ 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.")
+ if (O)
+ observer.forceMove(O.loc)
+ else
+ to_chat(src, "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
+ observer.set_ghost_appearance()
+ if(observer.client && observer.client.prefs)
+ observer.real_name = observer.client.prefs.real_name
+ observer.name = observer.real_name
+ observer.client.init_verbs()
+ observer.update_appearance()
+ observer.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+ deadchat_broadcast(" has observed.", "[observer.real_name]", follow_target = observer, turf_target = get_turf(observer), message_type = DEADCHAT_DEATHRATTLE)
+ QDEL_NULL(mind)
+ qdel(src)
+ return TRUE
+
+/proc/get_job_unavailable_error_message(retval, jobtitle)
+ switch(retval)
+ if(JOB_AVAILABLE)
+ return "[jobtitle] is available."
+ if(JOB_UNAVAILABLE_GENERIC)
+ return "[jobtitle] is unavailable."
+ if(JOB_UNAVAILABLE_BANNED)
+ return "You are currently banned from [jobtitle]."
+ if(JOB_UNAVAILABLE_PLAYTIME)
+ return "You do not have enough relevant playtime for [jobtitle]."
+ if(JOB_UNAVAILABLE_ACCOUNTAGE)
+ return "Your account is not old enough for [jobtitle]."
+ if(JOB_UNAVAILABLE_SLOTFULL)
+ return "[jobtitle] is already filled to capacity."
+ if(JOB_UNAVAILABLE_QUIRK)
+ return "[jobtitle] is restricted from your quirks."
+ if(JOB_UNAVAILABLE_SPECIES)
+ return "[jobtitle] is restricted from your species."
+ return "Error: Unknown job availability."
+
+/mob/dead/new_player/proc/IsJobUnavailable(rank, latejoin = FALSE)
+ var/datum/job/job = SSjob.GetJob(rank)
+ if(!job)
+ return JOB_UNAVAILABLE_GENERIC
+ if((job.current_positions >= job.total_positions) && job.total_positions != -1)
+ if(job.title == "Assistant")
+ 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)
+ return JOB_UNAVAILABLE_SLOTFULL
+ else
+ return JOB_UNAVAILABLE_SLOTFULL
+ if(is_banned_from(ckey, rank))
+ return JOB_UNAVAILABLE_BANNED
+ if(QDELETED(src))
+ return JOB_UNAVAILABLE_GENERIC
+ if(!job.player_old_enough(client))
+ return JOB_UNAVAILABLE_ACCOUNTAGE
+ if(job.required_playtime_remaining(client))
+ return JOB_UNAVAILABLE_PLAYTIME
+ if(job.has_banned_quirk(client.prefs))
+ return JOB_UNAVAILABLE_QUIRK
+ if(job.has_banned_species(client.prefs))
+ return JOB_UNAVAILABLE_SPECIES
+ if(latejoin && !job.special_check_latejoin(client))
+ return JOB_UNAVAILABLE_GENERIC
+ return JOB_AVAILABLE
+
+/mob/dead/new_player/proc/AttemptLateSpawn(rank)
+ var/error = IsJobUnavailable(rank)
+ if(error != JOB_AVAILABLE)
+ alert(src, get_job_unavailable_error_message(error, rank))
+ return FALSE
+
+ if(SSticker.late_join_disabled)
+ alert(src, "An administrator has disabled late join spawning.")
+ 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))
+ src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.")
+ return FALSE
+
+ 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/mob/living/character = create_character(TRUE) //creates the human and transfers vars and mind
+
+ 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
+
+ var/equip = SSjob.EquipRank(character, rank, TRUE, is_captain)
+ if(isliving(equip)) //Borgs get borged in the equip, so we need to make sure we handle the new mob.
+ character = equip
+
+ 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()
+
+ SSticker.minds += character.mind
+ character.client.init_verbs() // init verbs for the late join
+ var/mob/living/carbon/human/humanc
+
+ if(SSticker.mode.name == "assaultops")
+ if(is_assaultops_target(character.mind))
+ remove_assaultops_target(character.mind, original=TRUE)
+ if(check_assaultops_target(character))
+ add_assaultops_target(character, notify_target = TRUE)
+
+ if(ishuman(character))
+ humanc = character //Let's retypecast the var to be human,
+
+ if(humanc) //These procs all expect humans
+ GLOB.data_core.manifest_inject(humanc)
+ if(SSshuttle.arrivals)
+ SSshuttle.arrivals.QueueAnnounce(humanc, rank)
+ else
+ AnnounceArrival(humanc, rank)
+ AddEmploymentContract(humanc)
+
+ humanc.increment_scar_slot()
+ humanc.load_persistent_scars()
+
+ if(GLOB.curse_of_madness_triggered)
+ give_madness(humanc, GLOB.curse_of_madness_triggered)
+
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CREWMEMBER_JOINED, humanc, rank)
+
+ GLOB.joined_player_list += character.ckey
+
+ if(CONFIG_GET(flag/allow_latejoin_antagonists) && humanc) //Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais.
+ if(SSshuttle.emergency)
+ switch(SSshuttle.emergency.mode)
+ if(SHUTTLE_RECALL, SHUTTLE_IDLE)
+ SSticker.mode.make_antag_chance(humanc)
+ if(SHUTTLE_CALL)
+ if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5)
+ SSticker.mode.make_antag_chance(humanc)
+
+ if(humanc && CONFIG_GET(flag/roundstart_traits))
+ SSquirks.AssignQuirks(humanc, humanc.client, TRUE)
+
+ log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)
+
+/mob/dead/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee)
+ //TODO: figure out a way to exclude wizards/nukeops/demons from this.
+ for(var/C in GLOB.employmentCabinets)
+ var/obj/structure/filingcabinet/employment/employmentCabinet = C
+ if(!employmentCabinet.virgin)
+ employmentCabinet.addFile(employee)
+
+
+/mob/dead/new_player/proc/LateChoices()
+ var/list/dat = list("Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]
")
+ dat += "Alert Level: [capitalize(num2seclevel(GLOB.security_level))]
"
+ if(SSshuttle.emergency)
+ switch(SSshuttle.emergency.mode)
+ if(SHUTTLE_ESCAPE)
+ dat += "The station has been evacuated.
" + if(SHUTTLE_CALL) + if(!SSshuttle.canRecall()) + dat += "
The station is currently undergoing evacuation procedures.
" + for(var/datum/job/prioritized_job in SSjob.prioritized_jobs) + if(prioritized_job.current_positions >= prioritized_job.total_positions) + SSjob.prioritized_jobs -= prioritized_job + dat += "
| "
+ var/column_counter = 0
+ // render each category's available jobs
+ for(var/category in GLOB.position_categories)
+ // position_categories contains category names mapped to available jobs and an appropriate color
+ var/cat_color = GLOB.position_categories[category]["color"]
+ dat += " " + column_counter++ + if(column_counter > 0 && (column_counter % 3 == 0)) + dat += " | " + dat += " |
Crew Manifest
" + dat += GLOB.data_core.get_manifest_html() + + src << browse(dat, "window=manifest;size=387x420;can_close=1") + +/mob/dead/new_player/Move() + return 0 + + +/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=preferences") //closes job selection + src << browse(null, "window=mob_occupation") + src << browse(null, "window=latechoices") //closes late job selection + +// Used to make sure that a player has a valid job preference setup, used to knock players out of eligibility for anything if their prefs don't make sense. +// A "valid job preference setup" in this situation means at least having one job set to low, or not having "return to lobby" enabled +// Prevents "antag rolling" by setting antag prefs on, all jobs to never, and "return to lobby if preferences not available" +// Doing so would previously allow you to roll for antag, then send you back to lobby if you didn't get an antag role +// This also does some admin notification and logging as well, as well as some extra logic to make sure things don't go wrong +/mob/dead/new_player/proc/check_preferences() + if(!client) + return FALSE //Not sure how this would get run without the mob having a client, but let's just be safe. + if(client.prefs.joblessrole != RETURNTOLOBBY) + return TRUE + // If they have antags enabled, they're potentially doing this on purpose instead of by accident. Notify admins if so. + var/has_antags = FALSE + if(client.prefs.be_special.len > 0) + 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.") + ineligible_for_roles = TRUE + ready = PLAYER_NOT_READY + if(has_antags) + log_admin("[src.ckey] just got booted back to lobby with no jobs, but antags enabled.") + message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.") + + return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well + return TRUE + +/** + * Prepares a client for the interview system, and provides them with a new interview + * + * This proc will both prepare the user by removing all verbs from them, as well as + * giving them the interview form and forcing it to appear. + */ +/mob/dead/new_player/proc/register_for_interview() + // First we detain them by removing all the verbs they have on client + for (var/v in client.verbs) + var/procpath/verb_path = v + if (!(verb_path in GLOB.stat_panel_verbs)) + remove_verb(client, verb_path) + + // Then remove those on their mob as well + for (var/v in verbs) + var/procpath/verb_path = v + if (!(verb_path in GLOB.stat_panel_verbs)) + remove_verb(src, verb_path) + + // Then we create the interview form and show it to the client + var/datum/interview/I = GLOB.interviews.interview_for_client(client) + if (I) + I.ui_interact(src) + + // Add verb for re-opening the interview panel, and re-init the verbs for the stat panel + add_verb(src, /mob/dead/new_player/proc/open_interview) diff --git a/modular_skyrat/modules/customization/modules/client/preferences.dm b/modular_skyrat/modules/customization/modules/client/preferences.dm index d4a2a4de7c8..c1d3f974cb6 100644 --- a/modular_skyrat/modules/customization/modules/client/preferences.dm +++ b/modular_skyrat/modules/customization/modules/client/preferences.dm @@ -2786,7 +2786,7 @@ GLOBAL_LIST_INIT(food, list( if(istype(parent.mob, /mob/dead/new_player)) //is this shitcode? probably - I DONT CAREEE~ var/mob/dead/new_player/NP = parent.mob - NP.new_player_panel() + NP.show_titlescreen() if("tab") if (href_list["tab"]) diff --git a/modular_skyrat/modules/lobbyscreen/code/change_titlescreen.dm b/modular_skyrat/modules/lobbyscreen/code/change_titlescreen.dm new file mode 100644 index 00000000000..1c1cc5445f3 --- /dev/null +++ b/modular_skyrat/modules/lobbyscreen/code/change_titlescreen.dm @@ -0,0 +1,24 @@ +/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 + + for(var/mob/dead/new_player/N in GLOB.new_player_list) + N.show_titlescreen() + diff --git a/modular_skyrat/modules/lobbyscreen/code/lobby.dm b/modular_skyrat/modules/lobbyscreen/code/lobby.dm new file mode 100644 index 00000000000..2cbf5275174 --- /dev/null +++ b/modular_skyrat/modules/lobbyscreen/code/lobby.dm @@ -0,0 +1,210 @@ +GLOBAL_LIST_EMPTY(startup_messages) + +/mob/dead/new_player/proc/get_lobby_html() + var/dat = {" + + + + + + + + "} + if(SSticker.current_state == GAME_STATE_STARTUP) + dat += {"
"}
+ dat += {"
+
+
+ "}
+ var/loop_index = 0
+ for(var/i in GLOB.startup_messages)
+ if(loop_index >= 25)
+ break
+ dat += i
+ loop_index++
+ dat += "
"
+
+ else
+
+ if(!IsGuestKey(src.key))
+ dat += {"
+
+ "}
+ dat += playerpolls()
+ dat += "
"
+
+ dat += {"
+
+ SETUP ([uppertext(client.prefs.real_name)])
+ "}
+ if(!SSticker || SSticker.current_state <= GAME_STATE_PREGAME)
+ dat += {"[ready ? "READY ☑" : "READY ☒"]
+ "}
+ else
+ dat += {"JOIN
+ "}
+ dat += {"CREW
+ "}
+
+ dat += {"[client.prefs.be_antag ? "BE ANTAG ☑" : "BE ANTAG ☒"]
+ "}
+
+ dat += {"OBSERVE
+ "}
+ dat += {"
CHANGELOG + "} + + dat += "
"
+ dat += {"CHANGELOG + "} + + dat += "
"}
+ dat += {"
+
+ "}
+
+ dat += ""
+
+ return dat
+
+/proc/add_startupmessage(msg)
+ var/msg_dat = {""}
+
+ GLOB.startup_messages.Insert(1, msg_dat)
+
+ for(var/mob/dead/new_player/N in GLOB.new_player_list)
+ INVOKE_ASYNC(N, /mob/dead/new_player.proc/update_titlescreen)
diff --git a/modular_skyrat/modules/lobbyscreen/code/title_screen.dm b/modular_skyrat/modules/lobbyscreen/code/title_screen.dm
new file mode 100644
index 00000000000..0b6c866367d
--- /dev/null
+++ b/modular_skyrat/modules/lobbyscreen/code/title_screen.dm
@@ -0,0 +1,59 @@
+GLOBAL_VAR(current_lobby_screen)
+
+GLOBAL_LIST_EMPTY(lobby_screens)
+
+SUBSYSTEM_DEF(title)
+ name = "Title Screen"
+ flags = SS_NO_FIRE
+ init_order = INIT_ORDER_TITLE
+
+ var/file_path
+ var/icon/startup_splash
+
+/datum/controller/subsystem/title/Initialize()
+ if(file_path)
+ return
+
+ var/list/provisional_title_screens = flist("[global.config.directory]/title_screens/images/")
+ var/list/title_screens = list()
+
+ for(var/S in provisional_title_screens)
+ var/list/L = splittext(S,"+")
+ if((L.len == 1 && (L[1] != "exclude" && L[1] != "blank.png" && L[1] != "startup_splash")))
+ title_screens += S
+
+ if(L.len > 1 && lowertext(L[1]) == "startup_splash")
+ var/file_path = "[global.config.directory]/title_screens/images/[S]"
+ ASSERT(fexists(file_path))
+ startup_splash = new(fcopy_rsc(file_path))
+
+ if(startup_splash)
+ change_lobbyscreen(startup_splash)
+ else
+ change_lobbyscreen('modular_skyrat/modules/lobbyscreen/icons/loading_screen.gif')
+
+ if(length(title_screens))
+ for(var/i in title_screens)
+ var/file_path = "[global.config.directory]/title_screens/images/[i]"
+ ASSERT(fexists(file_path))
+ var/icon/title2use = new(fcopy_rsc(file_path))
+ GLOB.lobby_screens += title2use
+
+ return ..()
+
+/datum/controller/subsystem/title/Recover()
+ startup_splash = SStitle.startup_splash
+ file_path = SStitle.file_path
+
+
+/proc/change_lobbyscreen(new_screen)
+ if(new_screen)
+ GLOB.current_lobby_screen = new_screen
+ else
+ if(GLOB.lobby_screens.len)
+ GLOB.current_lobby_screen = pick(GLOB.lobby_screens)
+ else
+ GLOB.current_lobby_screen = 'modular_skyrat/modules/lobbyscreen/icons/skyrat_lobbyscreen.png'
+
+ for(var/mob/dead/new_player/N in GLOB.new_player_list)
+ INVOKE_ASYNC(N, /mob/dead/new_player.proc/show_titlescreen)
diff --git a/modular_skyrat/modules/lobbyscreen/icons/loading_screen.gif b/modular_skyrat/modules/lobbyscreen/icons/loading_screen.gif
new file mode 100644
index 00000000000..c8a2c487037
Binary files /dev/null and b/modular_skyrat/modules/lobbyscreen/icons/loading_screen.gif differ
diff --git a/modular_skyrat/modules/lobbyscreen/icons/skyrat_lobbyscreen.png b/modular_skyrat/modules/lobbyscreen/icons/skyrat_lobbyscreen.png
new file mode 100644
index 00000000000..3141156a6bd
Binary files /dev/null and b/modular_skyrat/modules/lobbyscreen/icons/skyrat_lobbyscreen.png differ
diff --git a/modular_skyrat/modules/lobbyscreen/readme.md b/modular_skyrat/modules/lobbyscreen/readme.md
new file mode 100644
index 00000000000..713eee38319
--- /dev/null
+++ b/modular_skyrat/modules/lobbyscreen/readme.md
@@ -0,0 +1,10 @@
+## Title: Lobby screens!
+
+MODULE ID: lobbyscreen
+
+### Description:
+
+Adds a brand new look to the lobby screen, adds a splash screen too, since that shit is awesome. Inspired by TauCeti, heavily modified by me.
+
+### Credits:
+Gandalf2k15 & TauCeti
diff --git a/tgstation.dme b/tgstation.dme
index 30118cf6e83..b7f2b14d51f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3561,6 +3561,7 @@
#include "modular_skyrat\master_files\code\modules\language\language_holders.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\emote_popup.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\carbon\carbon_say.dm"
+#include "modular_skyrat\master_files\code\modules\mob\living\dead\new_player\new_player.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\bumbles.dm"
#include "modular_skyrat\master_files\code\modules\power\lighting.dm"
#include "modular_skyrat\master_files\code\modules\projectiles\guns\gun.dm"
@@ -4024,6 +4025,9 @@
#include "modular_skyrat\modules\jungle\code\game\objects\structures\flora.dm"
#include "modular_skyrat\modules\large_doors\code\large_doors.dm"
#include "modular_skyrat\modules\layer_shift\code\modules\mob\mob_movement.dm"
+#include "modular_skyrat\modules\lobbyscreen\code\change_titlescreen.dm"
+#include "modular_skyrat\modules\lobbyscreen\code\lobby.dm"
+#include "modular_skyrat\modules\lobbyscreen\code\title_screen.dm"
#include "modular_skyrat\modules\mapping\code\dungeon.dm"
#include "modular_skyrat\modules\mapping\code\furniture.dm"
#include "modular_skyrat\modules\mapping\code\genpop.dm"