From 569112f8b352e0b3c191ac61a64c6334208b8fb8 Mon Sep 17 00:00:00 2001
From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Date: Thu, 3 Nov 2022 22:28:19 +0100
Subject: [PATCH] Loadout QoL - culture and origin availability fix (#15014)

---
 code/modules/client/preference_setup/loadout/loadout.dm  | 9 ++++++++-
 ...l-loadout-qol-culture-and-origin-availability-fix.yml | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/DreamySkrell-loadout-qol-culture-and-origin-availability-fix.yml

diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm
index bc194dc242e..96d129719c6 100644
--- a/code/modules/client/preference_setup/loadout/loadout.dm
+++ b/code/modules/client/preference_setup/loadout/loadout.dm
@@ -189,7 +189,10 @@ var/list/gear_datums = list()
 		
 		var/temp_html = ""
 		var/datum/job/job = pref.return_chosen_high_job()
-		var/available = (G.check_faction(pref.faction) && (job && G.check_role(job.title)) && G.check_culture(pref.culture) && G.check_origin(pref.origin))
+		var/available = (G.check_faction(pref.faction) \
+			&& (job && G.check_role(job.title)) \
+			&& G.check_culture(text2path(pref.culture)) \
+			&& G.check_origin(text2path(pref.origin)))
 		var/ticked = (G.display_name in pref.gear)
 		var/style = ""
 		
@@ -396,21 +399,25 @@ var/list/gear_datums = list()
 		return FALSE
 	return TRUE
 
+// arg should be a faction name string
 /datum/gear/proc/check_faction(var/faction_)
 	if((faction && faction_ && faction_ != "None" && faction_ != "Stellar Corporate Conglomerate") && (faction != faction_))
 		return FALSE
 	return TRUE
 
+// arg should be a role name string
 /datum/gear/proc/check_role(var/role)
 	if(role && allowed_roles && !(role in allowed_roles))
 		return FALSE
 	return TRUE
 
+// arg should be a culture path
 /datum/gear/proc/check_culture(var/culture)
 	if(culture && culture_restriction && !(culture in culture_restriction))
 		return FALSE
 	return TRUE
 
+// arg should be a origin path
 /datum/gear/proc/check_origin(var/origin)
 	if(origin && origin_restriction && !(origin in origin_restriction))
 		return FALSE
diff --git a/html/changelogs/DreamySkrell-loadout-qol-culture-and-origin-availability-fix.yml b/html/changelogs/DreamySkrell-loadout-qol-culture-and-origin-availability-fix.yml
new file mode 100644
index 00000000000..9750665bd1f
--- /dev/null
+++ b/html/changelogs/DreamySkrell-loadout-qol-culture-and-origin-availability-fix.yml
@@ -0,0 +1,8 @@
+
+author: DreamySkrell
+
+delete-after: True
+
+
+changes:
+  - bugfix: "Fixes loadout culture and origin check always failing, making it so culture and origin restricted items were always grayed out."