Fixes yet more runtimes. Makes click catcher screen objs shared. #23428
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lohikar
reviewed
Oct 7, 2018
code/modules/client/preferences.dm
Outdated
| @@ -50,6 +50,10 @@ datum/preferences | |||
| load_preferences() | |||
| load_and_update_character() | |||
| sanitize_preferences() | |||
| world.log << client.mob ? client.mob.type : "No mob" | |||
| var/output = "<div align='center'>" | ||
| /mob/new_player/proc/new_player_panel_proc(force = FALSE) | ||
| if(!SScharacter_setup.initialized && !force) | ||
| return // Not ready yet. |
There was a problem hiding this comment.
Is the player told in any way that the panel can't open?
There was a problem hiding this comment.
It will automatically be opened at ss init; the player doesn't need to see anything here, this just means that client/New() ran before SScharacter_setup/Initialize().
|
|
||
| /mob/new_player/proc/new_player_panel_proc() | ||
| var/output = "<div align='center'>" | ||
| /mob/new_player/proc/new_player_panel_proc(force = FALSE) |
There was a problem hiding this comment.
Legacy name, due to some old verb/proc hack (unclear the intention). Probably should rename.
There was a problem hiding this comment.
Whoops, didn't actually see the old one.
afterthought2
force-pushed
the
runtime_fixes
branch
from
7442b9d
to
c646255
Compare
…en clients. Fixes error with prefs and the new player window.
afterthought2
force-pushed
the
runtime_fixes
branch
from
c646255
to
7fafff3
Compare
comma
approved these changes
Oct 9, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #23102.
Fixes #21311 (the muzzle there is obsolete, currently occurs on live in holograms. will likely be reopned with other culprits).
Closes #20414 (not clear if this will fix it).
Fixes #23423.
Note that currently, click catchers are added to the client inconsistently due to above runtime.
This will make the new player panel (with buttons like Ready, Character Setup, etc.) not come up until the character setup SS inits (it's currently not interactive until approximately then anyway).