From 7dbd2e1668e956cb19c20a75a0bba91031bcdacd Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 23 Nov 2021 23:32:26 +0200 Subject: [PATCH] Probably fixes xenowear loadout reset bug Fixing the same thing I did with the language reset bug by adding a requirement for client presence on setup sanitizations involving whitelist checks that will automatically fail if client is missing, such as when getting dunked into cryo/whatever while SSD etc. --- code/modules/client/preference_setup/loadout/loadout.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 73ace32c3b..61603361f5 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -65,7 +65,7 @@ var/list/gear_datums = list() for(var/gear_name in gear_datums) var/datum/gear/G = gear_datums[gear_name] - if(G.whitelisted && config.loadout_whitelist != LOADOUT_WHITELIST_OFF) + if(G.whitelisted && config.loadout_whitelist != LOADOUT_WHITELIST_OFF && pref.client) //VOREStation Edit. 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]))