diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7313a9d28c..919f43651e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -879,10 +879,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/loadout_item = has_loadout_gear(loadout_slot, "[gear.type]") var/extra_color_data = "" if(loadout_item) - if(gear.category != LOADOUT_CATEGORY_UNLOCKABLE || can_use_unlockable(gear)) - class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(name)];toggle_gear=0'" - else - class_link = "style='white-space:normal;' class='linkOff'" + class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(name)];toggle_gear=0'" if(gear.loadout_flags & LOADOUT_CAN_COLOR_POLYCHROMIC) extra_color_data += "
Color" for(var/loadout_color in loadout_item[LOADOUT_COLOR]) @@ -897,8 +894,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) class_link = "style='white-space:normal;' class='linkOff'" else if(donoritem) class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(name)];toggle_gear=1'" - else + else if(!istype(gear, /datum/gear/unlockable) || can_use_unlockable(gear)) class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(name)];toggle_gear=1'" + else + class_link = "style='white-space:normal;background:#eb2e2e;' class='linkOff'" dat += "[name][extra_color_data]" dat += "[gear.cost]" if(islist(gear.restricted_roles)) @@ -911,7 +910,17 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" dat += gear.restricted_roles.Join(";") dat += "" - dat += "[gear.description]" + if(!istype(gear, /datum/gear/unlockable)) + dat += "[gear.description]" + else + //we add the user's progress to the description assuming they have progress + var/datum/gear/unlockable/unlockable = gear + var/progress_made = unlockable_loadout_data[unlockable.progress_key] + if(progress_made) + dat += "[gear.description] Progress: [min(progress_made, unlockable.progress_required)]/[unlockable.progress_required]" + else + dat += "[gear.description]" + dat += "" if(4) // Content preferences dat += "
"