cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully fixes disappearing loadouts

Browse Source
This commit is contained in:
Heroman3003
2019-11-22 11:27:28 +10:00
parent dd06a7b196
commit e7f2ca8055
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/client/preference_setup/loadout/loadout.dm
View File

@@ -70,10 +70,11 @@ var/list/gear_datums = list()
continue continue
if(max_cost && G.cost > max_cost) if(max_cost && G.cost > max_cost)
continue continue
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit if(preference_mob && preference_mob.client) //Vorestation Edit
continue //Vorestation Edit if(G.ckeywhitelist && !(preference_mob.mind.loaded_from_ckey in G.ckeywhitelist)) //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit continue //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 . += gear_name
/datum/category_item/player_setup_item/loadout/sanitize_character() /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>" . += "<tr><td colspan=3><hr></td></tr>"
for(var/gear_name in LC.gear) for(var/gear_name in LC.gear)
var/datum/gear/G = LC.gear[gear_name] var/datum/gear/G = LC.gear[gear_name]
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit if(preference_mob && preference_mob.client) //Vorestation Edit
continue //Vorestation Edit if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit continue //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) 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>" . += "<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>" . += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"