mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Lobby UI overhaul (#4738)
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * aaaaa * Update _basemap.dm * Update new_player.dm * Update CaveGenerator.dm * aaaaaaaaaaaaaaaaaaaaa * a * aaa * aaaa * aaaa * Update login.dm * aaaaaaaaaa * aaaaaa * Update lobby.dm
This commit is contained in:
@@ -683,6 +683,7 @@ SUBSYSTEM_DEF(job)
|
||||
to_chat(player, "<b>You have failed to qualify for any job you desired.</b>")
|
||||
unassigned -= player
|
||||
player.ready = PLAYER_NOT_READY
|
||||
player.client << output(player.ready, "lobbybrowser:imgsrc") //SKYRAT EDIT ADDITION
|
||||
|
||||
|
||||
/datum/controller/subsystem/job/Recover()
|
||||
|
||||
@@ -246,7 +246,8 @@ Used by the AI doomsday and the self-destruct nuke.
|
||||
if (!pm.load(1, 1, start_z + parsed_maps[P], no_changeturf = TRUE))
|
||||
errorList |= pm.original_path
|
||||
if(!silent)
|
||||
INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
|
||||
//INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
|
||||
add_startupmessage("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!") //SKYRAT EDIT CHANGE
|
||||
return parsed_maps
|
||||
|
||||
/datum/controller/subsystem/mapping/proc/loadWorld()
|
||||
@@ -258,7 +259,8 @@ Used by the AI doomsday and the self-destruct nuke.
|
||||
|
||||
// load the station
|
||||
station_start = world.maxz + 1
|
||||
INIT_ANNOUNCE("Loading [config.map_name]...")
|
||||
//INIT_ANNOUNCE("Loading [config.map_name]...") SKYRAT EDIT REMOVAL
|
||||
add_startupmessage("Loading [config.map_name]...")
|
||||
LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION)
|
||||
|
||||
if(SSdbcore.Connect())
|
||||
@@ -274,8 +276,6 @@ Used by the AI doomsday and the self-destruct nuke.
|
||||
++space_levels_so_far
|
||||
add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE)
|
||||
|
||||
LoadGroup(FailedZs, "Rockplanet", "skyrat/planets", "rockplanet.dmm", default_traits = ZTRAITS_ROCKPLANET)
|
||||
|
||||
if(config.minetype == "lavaland")
|
||||
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
|
||||
else if (!isnull(config.minetype) && config.minetype != "none")
|
||||
|
||||
@@ -161,6 +161,7 @@ SUBSYSTEM_DEF(ticker)
|
||||
to_chat(world, "<span class='boldnotice'>Welcome to [station_name()]!</span>")
|
||||
send2chat("<@&[CONFIG_GET(string/game_alert_role_id)]> New round starting on [SSmapping.config.map_name], [CONFIG_GET(string/servername)]! \nIf you wish to be pinged for game related stuff, go to <#[CONFIG_GET(string/role_assign_channel_id)]> and assign yourself the roles.", CONFIG_GET(string/chat_announce_new_game)) // Skyrat EDIT -- role ping
|
||||
current_state = GAME_STATE_PREGAME
|
||||
change_lobbyscreen() //SKYRAT EDIT ADDITION
|
||||
//Everyone who wants to be an observer is now spawned
|
||||
create_observers()
|
||||
fire()
|
||||
@@ -380,7 +381,7 @@ SUBSYSTEM_DEF(ticker)
|
||||
GLOB.joined_player_list += player.ckey
|
||||
player.create_character(FALSE)
|
||||
else
|
||||
player.new_player_panel()
|
||||
player.show_titlescreen()
|
||||
CHECK_TICK
|
||||
|
||||
/datum/controller/subsystem/ticker/proc/collect_minds()
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* SKYRAT EDIT REMOVAL - MOVED TO MODULAR
|
||||
SUBSYSTEM_DEF(title)
|
||||
name = "Title Screen"
|
||||
flags = SS_NO_FIRE
|
||||
@@ -67,3 +68,4 @@ SUBSYSTEM_DEF(title)
|
||||
splash_turf = SStitle.splash_turf
|
||||
file_path = SStitle.file_path
|
||||
previous_icon = SStitle.previous_icon
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user