cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10213

Browse Source
This commit is contained in:
Nadyr
2021-04-30 01:03:17 -04:00
committed by GitHub
parent e8e635184c 1930a85c2c
commit a34fd9cec8
31 changed files with 238 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preference_setup/loadout/loadout.dm
View File

@@ -66,18 +66,10 @@ var/list/gear_datums = list()
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 a8185bde6e... Merge pull request #10213 from Heroman3003/fixforw
if(G.whitelisted != pref.species)
continue
=======
//VOREStation Removal Start - No need for species-based whitelists for species clothes
//if(G.whitelisted && G.whitelisted != pref.species)
// continue
//VOREStation Removal End
>>>>>>> a8185bde6e... Merge pull request #10213 from Heroman3003/fixforw
if(max_cost && G.cost > max_cost)
continue
//VOREStation Edit Start