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

* 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
@@ -225,6 +225,9 @@
/datum/preferences/proc/return_chosen_high_job(var/title = FALSE)
var/datum/job/chosenJob
if(SSjobs.init_state < SS_INITSTATE_DONE)
return
if(job_civilian_low & ASSISTANT)
// Assistant is weird, has to be checked first because it overrides
chosenJob = SSjobs.bitflag_to_job["[SERVICE]"]["[job_civilian_low]"]
@@ -147,6 +147,10 @@
var/list/body_markings = prefs.body_markings
for(var/M in body_markings)
var/datum/sprite_accessory/marking/mark_datum = body_marking_styles_list[M]
if(!istype(mark_datum))
to_chat(usr, SPAN_WARNING("Invalid body marking [M] selected! Please re-save your markings, as they may have changed."))
continue
var/mark_color = "[body_markings[M]]"
for(var/BP in mark_datum.body_parts)