welp i got lazy

This commit is contained in:
kevinz000
2019-12-15 00:15:32 -07:00
parent 4970675467
commit 586dcb6f81
5 changed files with 24 additions and 18 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/last_ip
var/last_id
var/mutable_appearance/custom_holoform
var/icon/custom_holoform_icon
var/last_custom_holoform = 0
//Cooldowns for saving/loading. These are four are all separate due to loading code calling these one after another
+2 -2
View File
@@ -11,8 +11,8 @@
if(prefs.last_custom_holoform < world.time + CUSTOM_HOLOFORM_DELAY)
to_chat(src, "<span class='warning'>You are attempting to change custom holoforms too fast!</span>")
var/mutable_appearance/new_holoform = user_interface_custom_holoform(src)
var/icon/new_holoform = user_interface_custom_holoform(src)
if(new_holoform)
prefs.custom_holoform = new_holoform
prefs.custom_holoform_icon = new_holoform
prefs.last_custom_holoform = world.time
to_chat(src, "<span class='boldnotice'>Holoform set.</span>")
@@ -27,12 +27,7 @@
/datum/preferences/proc/update_preview_icon(equip_job = TRUE)
// Determine what job is marked as 'High' priority, and dress them up as such.
var/datum/job/previewJob
var/highest_pref = 0
for(var/job in job_preferences)
if(job_preferences["[job]"] > highest_pref)
previewJob = SSjob.GetJob(job)
highest_pref = job_preferences["[job]"]
var/datum/job/previewJob = get_highest_job()
if(previewJob)
// Silicons only need a very basic preview since there is no customization for them.
@@ -57,3 +52,11 @@
parent.show_character_previews(new /mutable_appearance(mannequin))
unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
/datum/preferences/proc/get_highest_job()
var/highest_pref = 0
var/datum/job/highest_job
for(var/job in job_preferences)
if(job_preferences["[job]"] > highest_pref)
highest_job = SSjob.GetJob(job)
highest_pref = job_preferences["[job]"]
return highest_job