From 6ce5eef293ce45ebdb269d5b99135782374c1f62 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 13 May 2016 08:21:00 +0200 Subject: [PATCH] Can now see how many points have been spent in each loadout category. Also adds a small hack to fix #12560. Validation no longer occurs if the preference mob doesn't exist. --- .../preference_setup/loadout/loadout.dm | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index cd1e3eff4c..e2d73ff8b3 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -105,19 +105,21 @@ var/list/gear_datums = list() firstcat = 0 else . += " |" + + var/datum/loadout_category/LC = loadout_categories[category] + var/category_cost = 0 + for(var/gear in LC.gear) + if(gear in pref.gear) + var/datum/gear/G = LC.gear[gear] + category_cost += G.cost + if(category == current_tab) - . += " [category] " + . += " [category] - [category_cost] " else - var/datum/loadout_category/LC = loadout_categories[category] - var/make_orange = FALSE - for(var/thing in LC.gear) - if(thing in pref.gear) - make_orange = TRUE - break - if(make_orange) - . += " [category] " + if(category_cost) + . += " [category] - [category_cost] " else - . += " [category] " + . += " [category] - 0 " . += "" var/datum/loadout_category/LC = loadout_categories[current_tab]