cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 12:44:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Adds config option to control loadout whitelist strictness

Browse Source
This commit is contained in:
Chompstation Bot
2021-04-28 16:46:12 +00:00
parent f516265384
commit 606e2e757c
4 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout.dm
+14 -1
View File
@@ -62,12 +62,25 @@ var/list/gear_datums = list()
/datum/category_item/player_setup_item/loadout/proc/valid_gear_choices(var/max_cost)
. = list()
var/mob/preference_mob = preference_mob()
var/mob/preference_mob = preference_mob() //VOREStation Add
for(var/gear_name in gear_datums)
var/datum/gear/G = gear_datums[gear_name]
<<<<<<< HEAD
if(G.whitelisted && !is_alien_whitelisted(preference_mob, GLOB.all_species[G.whitelisted]))
continue
||||||| parent of 7ee3781614... Merge pull request #10219 from VOREStation/upstream-merge-8055
//VOREStation Removal Start - No need for species-based whitelists for species clothes
//if(G.whitelisted && G.whitelisted != pref.species)
// continue
//VOREStation Removal End
=======
if(G.whitelisted && config.loadout_whitelist != LOADOUT_WHITELIST_OFF)
if(config.loadout_whitelist == LOADOUT_WHITELIST_STRICT && G.whitelisted != pref.species)
continue
if(config.loadout_whitelist == LOADOUT_WHITELIST_LAX && !is_alien_whitelisted(preference_mob(), GLOB.all_species[G.whitelisted]))
continue
>>>>>>> 7ee3781614... Merge pull request #10219 from VOREStation/upstream-merge-8055
if(max_cost && G.cost > max_cost)
continue
//VOREStation Edit Start