From e7f2ca8055842fe8af51c8b5a427bedb667bf0f5 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Fri, 22 Nov 2019 11:27:28 +1000
Subject: [PATCH 1/2] Hopefully fixes disappearing loadouts

---
 .../client/preference_setup/loadout/loadout.dm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm
index c2e1dc52a1d..5d332f22bdd 100644
--- a/code/modules/client/preference_setup/loadout/loadout.dm
+++ b/code/modules/client/preference_setup/loadout/loadout.dm
@@ -70,10 +70,11 @@ var/list/gear_datums = list()
 			continue
 		if(max_cost && G.cost > max_cost)
 			continue
-		if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit 
-			continue  //Vorestation Edit 
-		if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))  //Vorestation Edit 
-			continue  //Vorestation Edit 
+		if(preference_mob && preference_mob.client)	//Vorestation Edit
+			if(G.ckeywhitelist && !(preference_mob.mind.loaded_from_ckey in G.ckeywhitelist))	//Vorestation Edit
+				continue	//Vorestation Edit
+			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))	//Vorestation Edit
+				continue	//Vorestation Edit
 		. += gear_name
 
 /datum/category_item/player_setup_item/loadout/sanitize_character()
@@ -150,10 +151,11 @@ var/list/gear_datums = list()
 	. += "<tr><td colspan=3><hr></td></tr>"
 	for(var/gear_name in LC.gear)
 		var/datum/gear/G = LC.gear[gear_name]
-		if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
-			continue //Vorestation Edit
-		if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
-			continue //Vorestation Edit
+		if(preference_mob && preference_mob.client)	//Vorestation Edit
+			if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
+				continue //Vorestation Edit
+			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
+				continue //Vorestation Edit
 		var/ticked = (G.display_name in pref.gear)
 		. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"
 		. += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"

From 11ae9361aff837d4d08538d86f2133dbf0205f1f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 21 Nov 2019 20:50:49 -0500
Subject: [PATCH 2/2] Cleans up comments

---
 .../preference_setup/loadout/loadout.dm       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm
index 5d332f22bdd..b41671fc49e 100644
--- a/code/modules/client/preference_setup/loadout/loadout.dm
+++ b/code/modules/client/preference_setup/loadout/loadout.dm
@@ -70,11 +70,13 @@ var/list/gear_datums = list()
 			continue
 		if(max_cost && G.cost > max_cost)
 			continue
-		if(preference_mob && preference_mob.client)	//Vorestation Edit
-			if(G.ckeywhitelist && !(preference_mob.mind.loaded_from_ckey in G.ckeywhitelist))	//Vorestation Edit
-				continue	//Vorestation Edit
-			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))	//Vorestation Edit
-				continue	//Vorestation Edit
+		//VOREStation Edit Start
+		if(preference_mob && preference_mob.client)
+			if(G.ckeywhitelist && !(preference_mob.mind.loaded_from_ckey in G.ckeywhitelist))
+				continue
+			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))
+				continue
+		//VOREStation Edit End
 		. += gear_name
 
 /datum/category_item/player_setup_item/loadout/sanitize_character()
@@ -151,11 +153,13 @@ var/list/gear_datums = list()
 	. += "<tr><td colspan=3><hr></td></tr>"
 	for(var/gear_name in LC.gear)
 		var/datum/gear/G = LC.gear[gear_name]
-		if(preference_mob && preference_mob.client)	//Vorestation Edit
-			if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
-				continue //Vorestation Edit
-			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
-				continue //Vorestation Edit
+		//VOREStation Edit Start
+		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))
+				continue
+		//VOREStation Edit End
 		var/ticked = (G.display_name in pref.gear)
 		. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"
 		. += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"