cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Loadout QoL - culture and origin availability fix (#15014)

Browse Source
This commit is contained in:
DreamySkrell
2022-11-03 18:28:19 -03:00
committed by GitHub
parent 9f2bcfcc7f
commit 569112f8b3
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout.dm
+8 -1
View File
@@ -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