mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 14:39:58 +01:00
* Replaced the lobby menu (with actual art) (#60953) * a * a * Update new_player.dm * Update new_player.dm * Update new_player.dm * a * a * Update new_player.dm Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com> Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
co-authored by
AMonkeyThatCodes
Gandalf
parent
eaafda4681
commit
31b3a9331e
@@ -729,7 +729,6 @@ SUBSYSTEM_DEF(job)
|
||||
to_chat(player, "<span class='infoplain'><b>You have failed to qualify for any job you desired.</b></span>")
|
||||
unassigned -= player
|
||||
player.ready = PLAYER_NOT_READY
|
||||
player.client << output(player.ready, "lobbybrowser:imgsrc") //SKYRAT EDIT ADDITION
|
||||
|
||||
|
||||
/datum/controller/subsystem/job/Recover()
|
||||
|
||||
@@ -285,8 +285,7 @@ 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!")
|
||||
add_startupmessage("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!") //SKYRAT EDIT CHANGE
|
||||
INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
|
||||
return parsed_maps
|
||||
|
||||
/datum/controller/subsystem/mapping/proc/loadWorld()
|
||||
@@ -298,8 +297,7 @@ Used by the AI doomsday and the self-destruct nuke.
|
||||
|
||||
// load the station
|
||||
station_start = world.maxz + 1
|
||||
//INIT_ANNOUNCE("Loading [config.map_name]...") SKYRAT EDIT REMOVAL
|
||||
add_startupmessage("Loading [config.map_name]...")
|
||||
INIT_ANNOUNCE("Loading [config.map_name]...")
|
||||
LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION)
|
||||
|
||||
if(SSdbcore.Connect())
|
||||
@@ -320,13 +318,13 @@ Used by the AI doomsday and the self-destruct nuke.
|
||||
var/mining_traits_to_load = GLOB.mining_traits[SSrandommining.traits]
|
||||
if(config.minetype != "none")
|
||||
if(mining_map_to_load)
|
||||
add_startupmessage("MINING MAP: Loading mining level...")
|
||||
INIT_ANNOUNCE("MINING MAP: Loading mining level...")
|
||||
if(!mining_traits_to_load)
|
||||
add_startupmessage("MINING MAP ERROR: No z-level traits detected, loading without traits.")
|
||||
INIT_ANNOUNCE("MINING MAP ERROR: No z-level traits detected, loading without traits.")
|
||||
LoadGroup(FailedZs, "Mining Level", "map_files/Mining", mining_map_to_load, default_traits = mining_traits_to_load)
|
||||
add_startupmessage("MINING MAP: Loaded successfully.")
|
||||
INIT_ANNOUNCE("MINING MAP: Loaded successfully.")
|
||||
if(!mining_map_to_load)
|
||||
add_startupmessage("MINING MAP ERROR: No loadable map z-levels detected, reverting to backup mining system!")
|
||||
INIT_ANNOUNCE("MINING MAP ERROR: No loadable map z-levels detected, reverting to backup mining system!")
|
||||
if(config.minetype == "lavaland")
|
||||
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
|
||||
else if (!isnull(config.minetype) && config.minetype != "none")
|
||||
|
||||
@@ -158,9 +158,8 @@ SUBSYSTEM_DEF(ticker)
|
||||
discord_alerted = TRUE
|
||||
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 pingcurrent_state = GAME_STATE_PREGAME
|
||||
current_state = GAME_STATE_PREGAME
|
||||
change_lobbyscreen() //SKYRAT EDIT ADDITION
|
||||
//Everyone who wants to be an observer is now spawned
|
||||
create_observers()
|
||||
SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME)
|
||||
fire()
|
||||
if(GAME_STATE_PREGAME)
|
||||
//lobby stats for statpanels
|
||||
@@ -186,6 +185,7 @@ SUBSYSTEM_DEF(ticker)
|
||||
tipped = TRUE
|
||||
|
||||
if(timeLeft <= 0)
|
||||
SEND_SIGNAL(src, COMSIG_TICKER_ENTER_SETTING_UP)
|
||||
current_state = GAME_STATE_SETTING_UP
|
||||
Master.SetRunLevel(RUNLEVEL_SETUP)
|
||||
if(start_immediately)
|
||||
@@ -342,11 +342,9 @@ SUBSYSTEM_DEF(ticker)
|
||||
GLOB.joined_player_list += player.ckey
|
||||
var/atom/destination = player.mind.assigned_role.get_roundstart_spawn_point()
|
||||
if(!destination) // Failed to fetch a proper roundstart location, won't be going anywhere.
|
||||
player.show_titlescreen() //SKYRAT EDIT CHANGE
|
||||
continue
|
||||
player.create_character(destination)
|
||||
else
|
||||
player.show_titlescreen() //SKYRAT EDIT ADDITION
|
||||
|
||||
CHECK_TICK
|
||||
|
||||
/datum/controller/subsystem/ticker/proc/collect_minds()
|
||||
@@ -651,14 +649,6 @@ SUBSYSTEM_DEF(ticker)
|
||||
else
|
||||
timeLeft = newtime
|
||||
|
||||
//Everyone who wanted to be an observer gets made one now
|
||||
/datum/controller/subsystem/ticker/proc/create_observers()
|
||||
for(var/i in GLOB.new_player_list)
|
||||
var/mob/dead/new_player/player = i
|
||||
if(player.ready == PLAYER_READY_TO_OBSERVE && player.mind)
|
||||
//Break chain since this has a sleep input in it
|
||||
addtimer(CALLBACK(player, /mob/dead/new_player.proc/make_me_an_observer), 1)
|
||||
|
||||
/datum/controller/subsystem/ticker/proc/SetRoundEndSound(the_sound)
|
||||
set waitfor = FALSE
|
||||
round_end_sound_sent = FALSE
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
/* SKYRAT EDIT REMOVAL - MOVED TO MODULAR
|
||||
SUBSYSTEM_DEF(title)
|
||||
name = "Title Screen"
|
||||
flags = SS_NO_FIRE
|
||||
@@ -67,4 +66,3 @@ 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