From e8e635184c43b318a348a6790eb006a244ba5a8b Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Mon, 26 Apr 2021 18:45:57 +0000 Subject: [PATCH] Both fixes and comments out WL check --- .../modules/client/preference_setup/loadout/loadout.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index c91b2314c8..b2d0757713 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -66,8 +66,18 @@ 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