cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-12 08:27:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up runtime errors, fix VueUIs opening offscreen (#14025)

Browse Source 
* Clean up runtime errors, fix VueUIs opening offscreen

* woops

* myazaki is based
This commit is contained in:
Wildkins
2022-05-20 12:36:14 -04:00
committed by GitHub
parent da0000f7f2
commit 2bb8db37b9
14 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/occupation/occupation.dm
+4 -1
View File
@@ -139,7 +139,7 @@
sanitize_faction()
/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 16, list/splitJobs = list("Chief Engineer", "Head of Security"))
if (SSjobs.init_state != SS_INITSTATE_DONE && SSrecords.init_state != SS_INITSTATE_DONE)
if (SSjobs.init_state != SS_INITSTATE_DONE || SSrecords.init_state != SS_INITSTATE_DONE)
return "<center><large>Jobs controller not initialized yet. Please wait a bit and reload this section.</large></center>"
var/list/dat = list(
@@ -422,6 +422,9 @@
dat += factions.Join(" | ") + "</b>"
var/datum/faction/faction = SSjobs.name_factions[selected_faction]
if(!istype(faction))
to_client_chat(SPAN_DANGER("Invalid faction chosen. Resetting to default."))
selected_faction = SSjobs.default_faction.name
if (selected_faction == pref.faction)
dat += "<br>\[Faction already selected\]"