cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor /ui_state/new_player_state to what it's designed for (#71959)

Browse Source 
## About The Pull Request

`/datum/ui_state/new_player_state` now no longer lets users with R_ADMIN
permission see the UI. Changed `/datum/interview` to return always_state
when an admin watches an interview because it is important there.
`/datum/latejoin_menu` now uses new_player_state instead of its own
solution.
## Why It's Good For The Game

`/datum/ui_state/new_player_state` is designed to let lobby players
interact with the UI, so it does not make sense for it to make a weird
exception for admins too. My theory is that this was an oversight when
this was first implemented, since only `/datum/interview` used this
ui_state. It doesn't and it shouldn't be like this though. Code clarity.
## Changelog
No playerfacing changes.
This commit is contained in:
distributivgesetz
2022-12-16 16:01:50 +02:00
committed by GitHub
parent 1ebb3d5e02
commit dafef2aa4d
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/interview/interview.dm
+2
View File
@@ -117,6 +117,8 @@
ui.open()
/datum/interview/ui_state(mob/user)
if(check_rights_for(user.client, R_ADMIN))
return GLOB.always_state
return GLOB.new_player_state
/datum/interview/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
code/modules/mob/dead/new_player/latejoin_menu.dm
+6 -8
View File
@@ -26,8 +26,10 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
// In case they reopen the GUI
user.jobs_menu_mounted = FALSE
addtimer(CALLBACK(src, PROC_REF(scream_at_player), user), 5 SECONDS)
// FIXME: this can cause a runtime since user can be a living mob
if(istype(user))
user.jobs_menu_mounted = FALSE
addtimer(CALLBACK(src, PROC_REF(scream_at_player), user), 5 SECONDS)
ui = new(user, src, "JobSelection", "Latejoin Menu")
ui.open()
@@ -111,9 +113,8 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new)
return list("departments_static" = departments)
// we can't use GLOB.new_player_state here since it also allows any admin to see the ui, which will cause runtimes
/datum/latejoin_menu/ui_status(mob/user)
return isnewplayer(user) ? UI_INTERACTIVE : UI_CLOSE
/datum/latejoin_menu/ui_state(mob/user)
return GLOB.new_player_state
/datum/latejoin_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
@@ -158,9 +159,6 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new)
// SAFETY: AttemptLateSpawn has it's own sanity checks. This is perfectly safe.
owner.AttemptLateSpawn(params["job"])
return TRUE
if("viewpoll")
var/datum/poll_question/poll = locate(params["viewpoll"]) in GLOB.polls
if(!poll)
code/modules/tgui/states/new_player.dm
+2 -5
View File
@@ -1,13 +1,10 @@
/**
* tgui state: new_player_state
*
* Checks that the user is a new_player, or if user is an admin
* Checks that the user is a /mob/dead/new_player
*/
GLOBAL_DATUM_INIT(new_player_state, /datum/ui_state/new_player_state, new)
/datum/ui_state/new_player_state/can_use_topic(src_object, mob/user)
if(isnewplayer(user) || check_rights_for(user.client, R_ADMIN))
return UI_INTERACTIVE
return UI_CLOSE
return isnewplayer(user) ? UI_INTERACTIVE : UI_CLOSE