diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 46b87bedf8..80a797a49c 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -90,7 +90,7 @@ var/list/gear_datums = list() if(pref.client) if(G.ckeywhitelist && !(pref.client_ckey in G.ckeywhitelist)) continue - if(G.character_name && !(pref.client.prefs.real_name in G.character_name)) + if(G.character_name && pref.client.prefs && !(pref.client.prefs.real_name in G.character_name)) continue . += gear_name @@ -171,7 +171,7 @@ var/list/gear_datums = list() if(preference_mob && preference_mob.client) if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) continue - if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) + if(G.character_name && preference_mob.client.prefs && !(preference_mob.client.prefs.real_name in G.character_name)) continue var/ticked = (G.display_name in pref.gear) . += "[G.display_name]"