shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s

Browse Source
This commit is contained in:
kevinz000
2019-08-07 13:18:45 -07:00
parent 277971971f
commit 65473dc4ba
6 changed files with 34 additions and 3081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/donator_groupings.dm
+1 -1
View File
@@ -15,4 +15,4 @@
#define DONATOR_GROUP_TIER_2 "T2"
#define DONATOR_GROUP_TIER_3 "T3"
#define IS_CKEY_DONATOR_GROUP(ckey, group) is_donator_group(ckey, group)
#define IS_CKEY_DONATOR_GROUP(ckey, groupid) is_donator_group(ckey, groupid)
code/__HELPERS/donator_groupings.dm
+10 -11
View File
@@ -11,16 +11,15 @@ For fast lookups, this is generated using regenerate_donator_grouping_list()
/proc/is_donator_group(ckey, group)
ckey = ckey(ckey) //make sure it's ckey'd.
return GLOB.donators_by_group[group]?.Find(ckey)
var/list/L = GLOB.donators_by_group[group]
return L && L.Find(ckey)
/proc/regenerate_donator_grouping_list()
var/list/donator_list = GLOB.donators_by_group = list() //reinit everything
var/list/inclusive_add = list() //speed!
inclusive_add += TIER_1_DONATORS
donator_list[DONATOR_GROUP_TIER_1] = inclusive_add.Copy()
inclusive_add += TIER_2_DONATORS
donator_list[DONATOR_GROUP_TIER_2] = inclusive_add.Copy()
inclusive_add += TIER_3_DONATORS
donator_list[DONATOR_GROUP_TIER_3] = inclusive_add.Copy()
GLOB.donators_by_group = list() //reinit everything
var/list/donator_list = GLOB.donators_by_group //cache
var/list/tier_1 = TIER_1_DONATORS
donator_list[DONATOR_GROUP_TIER_1] = tier_1.Copy() //The .Copy() is to "decouple"/make a new list, rather than letting the global list impact the config list.
var/list/tier_2 = tier_1 + TIER_2_DONATORS //Using + on lists implies making new lists, so we don't need to manually Copy().
donator_list[DONATOR_GROUP_TIER_2] = tier_2
var/list/tier_3 = tier_2 + TIER_3_DONATORS
donator_list[DONATOR_GROUP_TIER_3] = tier_3
code/modules/client/preferences.dm
+4 -6
View File
@@ -914,11 +914,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<td width=80%><font size=2><b>Description</b></font></td></tr>"
for(var/j in GLOB.loadout_items[gear_tab])
var/datum/gear/gear = GLOB.loadout_items[gear_tab][j]
var/donoritem
if(gear.ckeywhitelist && gear.ckeywhitelist.len)
donoritem = TRUE
if(!(user.ckey in gear.ckeywhitelist))
continue
var/donoritem = gear.donoritem
if(donoritem && !gear.donator_ckey_check(user.ckey))
continue
var/class_link = ""
if(gear.type in chosen_gear)
class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=0'"
@@ -2225,7 +2223,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(!is_loadout_slot_available(G.category))
to_chat(user, "<span class='danger'>You cannot take this loadout, as you've already chosen too many of the same category!</span>")
return
if(G.ckeywhitelist && G.ckeywhitelist.len && !(user.ckey in G.ckeywhitelist))
if(G.donoritem && !G.donator_ckey_check(user.ckey))
to_chat(user, "<span class='danger'>This is an item intended for donator use only. You are not authorized to use this item.</span>")
return
if(gear_points >= initial(G.cost))