Attempt fix blackscreen (#18434)

* first reordering, committed in case i fuck up badly next

* from the moment i understood the weakness of my flesh

* sdafa

* you asked for this

* we can't have nice things

* sdafasdf

* sdafasd

* sdfa

* fsa

* worth a shot

* more pain

* sdfasdf
This commit is contained in:
Fluffy
2024-02-20 11:37:52 +00:00
committed by GitHub
parent 141dff58ab
commit 91e89a3d73
70 changed files with 412 additions and 393 deletions
@@ -13,10 +13,8 @@
mind.active = 1
mind.current = src
loc = null
my_client = client
set_sight(sight|SEE_TURFS)
set_sight(BLIND)
GLOB.player_list |= src
client.playtitlemusic()
+12 -8
View File
@@ -1,7 +1,7 @@
//MENU SYSTEM BY BIGRAGE, some awful code, some awful design, all as you love //Code edits/additions by AshtonFox
/mob/abstract/new_player/instantiate_hud(datum/hud/HUD, ui_style, ui_color, ui_alpha)
HUD.new_player_hud(ui_style, ui_color, ui_alpha)
HUD.mymob = src
HUD.new_player_hud(ui_style, ui_color, ui_alpha)
/datum/hud/new_player
hud_shown = TRUE
@@ -9,6 +9,8 @@
hotkey_ui_hidden = FALSE
/datum/hud/proc/new_player_hud(var/ui_style='icons/mob/screen/white.dmi', var/ui_color = "#fffffe", var/ui_alpha = 255)
SHOULD_NOT_SLEEP(TRUE)
adding = list()
var/obj/screen/using
@@ -107,7 +109,9 @@
return
/obj/screen/new_player/title/proc/Update()
if(QDELING(src))
SHOULD_NOT_SLEEP(TRUE)
if(QDELETED(src))
return
if(!SSatlas.current_map.lobby_transitions && SSatlas.current_sector.sector_lobby_transitions)
@@ -119,17 +123,13 @@
lobby_index = 1
animate(src, alpha = 0, time = 1 SECOND)
animate(alpha = 255, icon_state = SSatlas.current_map.lobby_screens[lobby_index], time = 1 SECOND)
if(!MC_RUNNING())
spawn(SSatlas.current_map.lobby_transitions)
Update()
else
refresh_timer_id = addtimer(CALLBACK(src, PROC_REF(Update)), SSatlas.current_map.lobby_transitions, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_OVERRIDE | TIMER_STOPPABLE)
refresh_timer_id = addtimer(CALLBACK(src, PROC_REF(Update)), SSatlas.current_map.lobby_transitions, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_OVERRIDE | TIMER_STOPPABLE)
/obj/screen/new_player/selection
var/click_sound = 'sound/effects/menu_click.ogg'
var/hud_arrow
/obj/screen/new_player/selection/New(var/datum/hud/H)
/obj/screen/new_player/selection/New(datum/hud/H)
color = null
hud = H
..()
@@ -138,6 +138,10 @@
. = ..()
set_sector_things()
/obj/screen/new_player/selection/Destroy(force)
hud = null
. = ..()
/obj/screen/new_player/selection/set_sector_things()
. = ..()
if(SSatlas.current_sector.sector_hud_menu_sound)
@@ -19,9 +19,23 @@
INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
/mob/abstract/new_player/Initialize()
/mob/abstract/new_player/Initialize(mapload)
. = ..()
GLOB.dead_mob_list -= src
attempt_moving_new_player_on_marker_turf()
/mob/abstract/new_player/proc/attempt_moving_new_player_on_marker_turf()
//If it's set, move the new_player mob to it, otherwise reschedule to check in a bit
if(istype(GLOB.lobby_mobs_location))
src.forceMove(GLOB.lobby_mobs_location)
else
//Atoms loading have finished supposedly, there should be a marker down for this, if not found throw a stack trace
if(SSATOMS_IS_PROBABLY_DONE)
stack_trace("The map is supposedly loaded, but GLOB.lobby_mobs_location is not set, unable to move the lobby mob!")
return
addtimer(CALLBACK(src, PROC_REF(attempt_moving_new_player_on_marker_turf)), 5 SECONDS)
/mob/abstract/new_player/Destroy()
QDEL_NULL(late_choices_ui)
+2 -3
View File
@@ -54,6 +54,7 @@
* ckey.
*/
/mob/proc/LateLogin()
SHOULD_NOT_SLEEP(TRUE)
SHOULD_CALL_PARENT(TRUE)
SEND_SIGNAL(src, COMSIG_MOB_LOGIN)
@@ -103,7 +104,5 @@
// Check code/modules/admin/verbs/antag-ooc.dm for definition
client.add_aooc_if_necessary()
if(client)
if(client && !istype(src, /mob/abstract/new_player)) //Do not update the skybox if it's a new player mob, they don't see it anyways and it can runtime
client.update_skybox(TRUE)
addtimer(CALLBACK(client, TYPE_PROC_REF(/client, check_panel_loaded)), 30 SECONDS)